diff --git a/ChangeLog b/ChangeLog
index af249a76d..2482d724f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-12-01  Yoshinori K. Okuji  <okuji@enbug.org>
+
+	From Alexander Langer <alex@big.endian.de>:
+	* stage2/freebsd.h (RB_GDB): New macro.
+	(RB_MUTE): Likewise.
+	(RB_MULTIPLE): Likewise.
+
+	* stage2/boot.c (bsd_boot): Set the bits of RB_MULTIPLE, RB_GDB
+	and RB_MUTE when "-D", "-g" and "-m" are specified,
+	respectively.
+
 2002-12-01  Yoshinori K. Okuji  <okuji@enbug.org>
 
 	* docs/grub.texi (Reporting bugs): Specify the project page of
diff --git a/THANKS b/THANKS
index b423e8ada..d60e5b924 100644
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Adam Lackorzynski <adam@os.inf.tu-dresden.de>
 Adrian Phillips <a.phillips@dnmi.no>
 Alessandro Rubini <rubini@gnu.org>
 Alexander K. Hudek <alexhudek@home.com>
+Alexander Langer <alex@big.endian.de>
 Alfred M. Szmidt <ams@kemisten.nu>
 Andrew Clausen <clausen@gnu.org>
 Ben Liblit <liblit@eecs.berkeley.edu>
diff --git a/stage2/boot.c b/stage2/boot.c
index f490d1593..ace0d1f02 100644
--- a/stage2/boot.c
+++ b/stage2/boot.c
@@ -887,8 +887,14 @@ bsd_boot (kernel_t type, int bootdev, char *arg)
 		clval |= RB_CONFIG;
 	      if (*str == 'd')
 		clval |= RB_KDB;
+	      if (*str == 'D')
+		clval |= RB_MULTIPLE;
+	      if (*str == 'g')
+		clval |= RB_GDB;
 	      if (*str == 'h')
 		clval |= RB_SERIAL;
+	      if (*str == 'm')
+		clval |= RB_MUTE;
 	      if (*str == 'r')
 		clval |= RB_DFLTROOT;
 	      if (*str == 's')
diff --git a/stage2/freebsd.h b/stage2/freebsd.h
index dc57d1986..ffbf602b5 100644
--- a/stage2/freebsd.h
+++ b/stage2/freebsd.h
@@ -33,6 +33,9 @@
 #define RB_VERBOSE      0x800	/* print all potentially useful info */
 #define RB_SERIAL       0x1000	/* user serial port as console */
 #define RB_CDROM        0x2000	/* use cdrom as root */
+#define RB_GDB		0x8000	/* use GDB remote debugger instead of DDB */
+#define RB_MUTE		0x10000	/* Come up with the console muted */
+#define RB_MULTIPLE	0x20000000	/* Use multiple consoles */
 
 #define RB_BOOTINFO     0x80000000	/* have `struct bootinfo *' arg */