diff --git a/sys/ddb/db_command.c b/sys/ddb/db_command.c
index 1bf43de7d29..9b84481d490 100644
--- a/sys/ddb/db_command.c
+++ b/sys/ddb/db_command.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_command.c,v 1.25 1998/02/13 02:19:29 bde Exp $
+ *	$Id: db_command.c,v 1.26 1998/05/19 11:02:22 phk Exp $
  */
 
 /*
@@ -369,7 +369,6 @@ static struct command db_show_cmds[] = {
 	{ "all",	0,			0,	db_show_all_cmds },
 	{ "registers",	db_show_regs,		0,	0 },
 	{ "breaks",	db_listbreak_cmd, 	0,	0 },
-	{ "msgbuf",	db_show_msgbuf,		0,	0 },
 #if 0
 	{ "thread",	db_show_one_thread,	0,	0 },
 #endif
diff --git a/sys/ddb/db_print.c b/sys/ddb/db_print.c
index c67c96408a8..f6db84f1dc2 100644
--- a/sys/ddb/db_print.c
+++ b/sys/ddb/db_print.c
@@ -23,7 +23,7 @@
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  *
- *	$Id: db_print.c,v 1.14 1997/06/14 11:52:36 bde Exp $
+ *	$Id: db_print.c,v 1.15 1998/05/19 11:02:23 phk Exp $
  */
 
 /*
@@ -35,6 +35,7 @@
  * Miscellaneous printing.
  */
 #include <sys/param.h>
+#include <sys/kernel.h>
 #include <sys/msgbuf.h>
 
 #include <ddb/ddb.h>
@@ -67,12 +68,7 @@ db_show_regs(dummy1, dummy2, dummy3, dummy4)
 }
 
 
-void
-db_show_msgbuf(dummy1, dummy2, dummy3, dummy4)
-	db_expr_t	dummy1;
-	boolean_t	dummy2;
-	db_expr_t	dummy3;
-	char *		dummy4;
+DB_SHOW_COMMAND(msgbuf, db_show_msgbuf)
 {
 	int i,j;
 
diff --git a/sys/ddb/ddb.h b/sys/ddb/ddb.h
index b635ff2511d..e704561dfd4 100644
--- a/sys/ddb/ddb.h
+++ b/sys/ddb/ddb.h
@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ddb.h,v 1.15 1998/02/13 02:19:29 bde Exp $
+ *	$Id: ddb.h,v 1.16 1998/05/19 11:02:24 phk Exp $
  */
 
 /*
@@ -116,7 +116,6 @@ db_cmdfcn_t	db_print_cmd;
 db_cmdfcn_t	db_ps;
 db_cmdfcn_t	db_search_cmd;
 db_cmdfcn_t	db_set_cmd;
-db_cmdfcn_t	db_show_msgbuf;
 db_cmdfcn_t	db_show_regs;
 db_cmdfcn_t	db_single_step_cmd;
 db_cmdfcn_t	db_stack_trace_cmd;