diff --git a/README b/README
index f7ab78a..cec6851 100644
--- a/README
+++ b/README
@@ -823,7 +823,6 @@ The following options need to be configured:
 		CONFIG_CMD_AES		  AES 128 CBC encrypt/decrypt
 		CONFIG_CMD_ASKENV	* ask for env variable
 		CONFIG_CMD_BDI		  bdinfo
-		CONFIG_CMD_BEDBUG	* Include BedBug Debugger
 		CONFIG_CMD_BMP		* BMP support
 		CONFIG_CMD_BSP		* Board specific commands
 		CONFIG_CMD_BOOTD	  bootd
diff --git a/cmd/Kconfig b/cmd/Kconfig
index e52af92..0c6d44e 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -867,6 +867,17 @@ config MTDPARTS_DEFAULT
 
 endmenu
 
+menu "Debug commands"
+
+config CMD_BEDBUG
+	bool "bedbug"
+	help
+	  The bedbug (emBEDded deBUGger) command provides debugging features
+	  for some PowerPC processors. For details please see the
+	  docuemntation in doc/README.beddbug
+
+endmenu
+
 config CMD_UBI
 	tristate "Enable UBI - Unsorted block images commands"
 	select CRC32
diff --git a/configs/motionpro_defconfig b/configs/motionpro_defconfig
index b770820..70c04c3 100644
--- a/configs/motionpro_defconfig
+++ b/configs/motionpro_defconfig
@@ -14,6 +14,7 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_FAT=y
+CONFIG_CMD_BEDBUG=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
 CONFIG_LED_STATUS_BIT=0
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index a8befe3..825ccf7 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,7 +13,6 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_BEDBUG	/* Include BedBug Debugger	*/
 #define CONFIG_CMD_BMP		/* BMP support			*/
 #define CONFIG_CMD_BSP		/* Board Specific functions	*/
 #define CONFIG_CMD_CLK		/* Clock support		*/
diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index 0437296..e788f9c 100644
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -66,7 +66,6 @@
 /*
  * Command line configuration.
  */
-#undef CONFIG_CMD_BEDBUG
 
 #ifdef CONFIG_DBAU1550
 
diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h
index 7ebcd03..ec4f8f5 100644
--- a/include/configs/motionpro.h
+++ b/include/configs/motionpro.h
@@ -33,7 +33,6 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index 504ddf7..f6bd4fe 100644
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -149,6 +149,5 @@
  */
 
 #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_BEDBUG
 
 #endif	/* __CONFIG_H */
diff --git a/include/configs/vct.h b/include/configs/vct.h
index 99cb311..9db6fee 100644
--- a/include/configs/vct.h
+++ b/include/configs/vct.h
@@ -255,7 +255,6 @@ int vct_gpio_get(int pin);
  * (NOR/OneNAND) usage and Linux kernel booting.
  */
 #if defined(CONFIG_VCT_SMALL_IMAGE)
-#undef CONFIG_CMD_BEDBUG
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_EEPROM
 #undef CONFIG_CMD_IRQ
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index caea65b..a58faf7 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -393,7 +393,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_BEDBUG
 CONFIG_CMD_BLOB
 CONFIG_CMD_BMODE
 CONFIG_CMD_BMP