diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index ccdb027409bd..8b15a49ee3da 100755
--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@@ -33,6 +33,17 @@ case ${sendmail_enable} in
 	;;
 esac
 
+# If sendmail_enable=yes, don't need submit or outbound daemon
+if checkyesno sendmail_enable; then
+	sendmail_submit_enable="NO"
+	sendmail_outbound_enable="NO"
+fi
+
+# If sendmail_submit_enable=yes, don't need outbound daemon
+if checkyesno sendmail_submit_enable; then
+	sendmail_outbound_enable="NO"
+fi
+
 sendmail_precmd()
 {
 	# Die if there's pre-8.10 custom configuration file.  This check is
@@ -58,16 +69,6 @@ sendmail_precmd()
 	    "${name}: /etc/mail/aliases.db not present, generating"
 			/usr/bin/newaliases
 	fi
-
-	# check couple of common db files, too
-	for f in genericstable virtusertable domaintable mailertable; do
-		if [ -r "/etc/mail/$f" -a \
-		    "/etc/mail/$f" -nt "/etc/mail/$f.db" ]; then
-			echo \
-    "${name}: /etc/mail/$f newer than /etc/mail/$f.db, regenerating"
-			/usr/sbin/makemap hash /etc/mail/$f < /etc/mail/$f
-		fi
-	done
 }
 
 run_rc_command "$1"