diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index b6e23186d80b..e54540f44339 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -43,10 +43,10 @@ powerd_flags=""		# Flags to powerd (if enabled).
 removable_route_flush="YES" # Flush routes when removing an interface
 tmpmfs="AUTO"		# Set to YES to always create an mfs /tmp, NO to never
 tmpsize="20m"		# Size of mfs /tmp if created
-tmpmfs_flags="-S"	# Extra mdmfs options for the mfs /tmp
+tmpmfs_flags="-S -M"	# Extra mdmfs options for the mfs /tmp
 varmfs="AUTO"		# Set to YES to always create an mfs /var, NO to never
 varsize="32m"		# Size of mfs /var if created
-varmfs_flags="-S"	# Extra mount options for the mfs /var
+varmfs_flags="-S -M"	# Extra mount options for the mfs /var
 populate_var="AUTO"	# Set to YES to always (re)populate /var, NO to never
 local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs.
 script_name_sep=" "	# Change if your startup scripts' names contain spaces
diff --git a/etc/rc.subr b/etc/rc.subr
index e70fffbd4b7d..94944ab70b94 100644
--- a/etc/rc.subr
+++ b/etc/rc.subr
@@ -1294,7 +1294,7 @@ mount_md()
 	if [ -n "$3" ]; then
 		flags="$3"
 	fi
-	/sbin/mdmfs $flags -s $1 -M md $2
+	/sbin/mdmfs $flags -s $1 md $2
 }
 
 # ltr str src dst