diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index 90f3e102eed..60e98977c46 100644
--- a/etc/rc.d/dumpon
+++ b/etc/rc.d/dumpon
@@ -26,7 +26,11 @@ dumpon_start()
 		while read dev mp type more ; do
 			[ "${type}" = "swap" ] || continue
 			[ -c "${dev}" ] || continue
-			/sbin/dumpon -v "${dev}" 2>/dev/null && return 0
+			if /sbin/dumpon -v "${dev}" 2>/dev/null; then
+				# Make a symlink in devfs for savecore
+				ln -s ${dev} /dev/dumpdev
+				return 0
+			fi
 		done </etc/fstab
 		echo "No suitable dump device was found." 1>&2
 		return 1
@@ -43,6 +47,7 @@ dumpon_stop()
 	[Nn][Oo] | '')
 		;;
 	*)
+		rm -f /dev/dumpdev
 		/sbin/dumpon -v off
 		;;
 	esac
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index e6904b5c577..ed6b45864e3 100755
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -29,6 +29,9 @@ savecore_prestart()
 		debug 'No dump device. Quitting.'
 		return 1
 		;;
+	[Aa][Uu][Tt][Oo])
+		dumpdev=/dev/dumpdev
+		;;
 	esac
 
 	# If there is no crash directory set it now
@@ -50,8 +53,8 @@ savecore_prestart()
 
 savecore_start()
 {
-		echo "Checking for core dump on ${dumpdev} ..."
-		savecore ${savecore_flags} ${DUMPDIR} ${dumpdev}
+	echo "Checking for core dump on ${dumpdev}..."
+	savecore ${savecore_flags} ${DUMPDIR} ${dumpdev}
 }
 
 load_rc_config $name