diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c
index 9e239be9697d..df3fe81d17ca 100644
--- a/sys/boot/i386/boot2/boot2.c
+++ b/sys/boot/i386/boot2/boot2.c
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
 #define PATH_KERNEL	"/boot/kernel/kernel"
 
 #define ARGS		0x900
-#define NOPT		12
+#define NOPT		14
 #define NDEV		3
 #define MEM_BASE	0x12
 #define MEM_EXT 	0x15
@@ -99,12 +99,14 @@ __FBSDID("$FreeBSD$");
 
 extern uint32_t _end;
 
-static const char optstr[NOPT] = "DhaCgmnpqrsv"; /* Also 'P', 'S' */
+static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */
 static const unsigned char flags[NOPT] = {
     RBX_DUAL,
     RBX_SERIAL,
     RBX_ASKNAME,
     RBX_CDROM,
+    RBX_CONFIG,
+    RBX_KDB,
     RBX_GDB,
     RBX_MUTE,
     RBX_NOINTR,
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c
index 9e239be9697d..df3fe81d17ca 100644
--- a/sys/boot/i386/gptboot/gptboot.c
+++ b/sys/boot/i386/gptboot/gptboot.c
@@ -79,7 +79,7 @@ __FBSDID("$FreeBSD$");
 #define PATH_KERNEL	"/boot/kernel/kernel"
 
 #define ARGS		0x900
-#define NOPT		12
+#define NOPT		14
 #define NDEV		3
 #define MEM_BASE	0x12
 #define MEM_EXT 	0x15
@@ -99,12 +99,14 @@ __FBSDID("$FreeBSD$");
 
 extern uint32_t _end;
 
-static const char optstr[NOPT] = "DhaCgmnpqrsv"; /* Also 'P', 'S' */
+static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */
 static const unsigned char flags[NOPT] = {
     RBX_DUAL,
     RBX_SERIAL,
     RBX_ASKNAME,
     RBX_CDROM,
+    RBX_CONFIG,
+    RBX_KDB,
     RBX_GDB,
     RBX_MUTE,
     RBX_NOINTR,