diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -925,12 +925,11 @@
 	 */
 	td->td_stopsched = 1;
 
-	bootopt = RB_AUTOBOOT;
+	bootopt = RB_AUTOBOOT | RB_DUMP;
 	newpanic = 0;
 	if (KERNEL_PANICKED())
 		bootopt |= RB_NOSYNC;
 	else {
-		bootopt |= RB_DUMP;
 		panicstr = fmt;
 		panicked = true;
 		newpanic = 1;