Index: libexec/rc/rc.d/dumpon
===================================================================
--- libexec/rc/rc.d/dumpon
+++ libexec/rc/rc.d/dumpon
@@ -61,17 +61,19 @@
 			dumpon_try "${dev}"
 			return $?
 		fi
-		while read dev mp type more ; do
-			[ "${type}" = "swap" ] || continue
-			case ${dev} in
-			*.bde|*.eli)
-				dumpon_warn_unencrypted
-				dev=${dev%.*}
-				;;
-			esac
-			[ -c "${dev}" ] || continue
-			dumpon_try "${dev}" 2>/dev/null && return 0
-		done </etc/fstab
+		for parttype in dump swap; do
+			while read dev mp type more ; do
+				[ "${type}" = ${parttype} ] || continue
+				case ${dev} in
+				*.bde|*.eli)
+					dumpon_warn_unencrypted
+					dev=${dev%.*}
+					;;
+				esac
+				[ -c "${dev}" ] || continue
+				dumpon_try "${dev}" 2>/dev/null && return 0
+			done </etc/fstab
+		done
 		echo "No suitable dump device was found." 1>&2
 		return 1
 		;;