diff --git a/etc/auto_master b/etc/auto_master
index 255b7f861b84..55ee99172ea0 100644
--- a/etc/auto_master
+++ b/etc/auto_master
@@ -5,5 +5,5 @@
 /net		-hosts		-nobrowse,nosuid,intr
 # When using the -media special map, make sure to edit devd.conf(5)
 # to move the call to "automount -c" out of the comments section.
-#/media		-media		-nosuid
+#/media		-media		-nosuid,noatime
 #/-		-noauto
diff --git a/etc/autofs/special_media b/etc/autofs/special_media
index 86824b62f10e..a9c4b1b2f018 100755
--- a/etc/autofs/special_media
+++ b/etc/autofs/special_media
@@ -41,7 +41,7 @@ print_map_entry() {
 	case "${_fstype}" in
 	"ntfs")
 		if [ -f "/usr/local/bin/ntfs-3g" ]; then
-			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid,noatime	:/dev/${_p}" 
+			echo "-mountprog=/usr/local/bin/ntfs-3g,fstype=${_fstype},nosuid	:/dev/${_p}" 
 		else
 			/usr/bin/logger -p info -t "special_media[$$]" \
 			    "Cannot mount ${_fstype} formatted device /dev/${_p}: Install sysutils/fusefs-ntfs first"
@@ -49,7 +49,7 @@ print_map_entry() {
 		fi
 		;;
 	"ext2fs" | "msdosfs" | "ufs")
-		echo "-fstype=${_fstype},nosuid,noatime,async	:/dev/${_p}" 
+		echo "-fstype=${_fstype},nosuid,async	:/dev/${_p}" 
 		;;
 	*)
 		echo "-fstype=${_fstype},nosuid	:/dev/${_p}"