Index: usr.sbin/etcupdate/etcupdate.8
===================================================================
--- usr.sbin/etcupdate/etcupdate.8
+++ usr.sbin/etcupdate/etcupdate.8
@@ -33,7 +33,7 @@
 .Nd "manage updates to system files not updated by installworld"
 .Sh SYNOPSIS
 .Nm
-.Op Fl npBF
+.Op Fl anpBF
 .Op Fl d Ar workdir
 .Op Fl r | Fl s Ar source | Fl t Ar tarball
 .Op Fl A Ar patterns
@@ -474,6 +474,9 @@
 or
 .Dv TARGET_ARCH
 variables for a cross-build.
+.It Fl a
+In default mode, run automated which defaults to preserving local changes to
+files if merge is not successful.
 .It Fl n
 Enable
 .Dq dry-run
Index: usr.sbin/etcupdate/etcupdate.sh
===================================================================
--- usr.sbin/etcupdate/etcupdate.sh
+++ usr.sbin/etcupdate/etcupdate.sh
@@ -63,7 +63,7 @@
 usage()
 {
 	cat <<EOF
-usage: etcupdate [-npBF] [-d workdir] [-r | -s source | -t tarball]
+usage: etcupdate [-anpBF] [-d workdir] [-r | -s source | -t tarball]
                  [-A patterns] [-D destdir] [-I patterns] [-L logfile]
                  [-M options]
        etcupdate build [-B] [-d workdir] [-s source] [-L logfile] [-M options]
@@ -877,13 +877,17 @@
 	while true; do
 		# Only display the resolved command if the file
 		# doesn't contain any conflicts.
-		echo -n "Select: (p) postpone, (df) diff-full, (e) edit,"
-		if ! has_conflicts $1; then
-			echo -n " (r) resolved,"
+		if [ -n "$automated" ] ; then
+			command=mf
+		else
+			echo -n "Select: (p) postpone, (df) diff-full, (e) edit,"
+			if ! has_conflicts $1; then
+				echo -n " (r) resolved,"
+			fi
+			echo
+			echo -n "        (h) help for more options: "
+			read command
 		fi
-		echo
-		echo -n "        (h) help for more options: "
-		read command
 		case $command in
 			df)
 				diff -u ${DESTDIR}$1 ${CONFLICTS}$1
@@ -1635,8 +1639,12 @@
 ignore=
 nobuild=
 preworld=
-while getopts "d:nprs:t:A:BD:FI:L:M:" option; do
+automated=
+while getopts "d:anprs:t:A:BD:FI:L:M:" option; do
 	case "$option" in
+		a)
+			automated=YES
+			;;
 		d)
 			WORKDIR=$OPTARG
 			;;