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
 
 
 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
 
 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
 
  * 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                */
 
 /*
  * Command line configuration.
  */
-#undef CONFIG_CMD_BEDBUG
 
 #ifdef CONFIG_DBAU1550
 
 
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_BEDBUG
 #define CONFIG_CMD_DATE
 #define CONFIG_CMD_DTT
 #define CONFIG_CMD_EEPROM
 
  */
 
 #undef CONFIG_CMD_IDE
-#undef CONFIG_CMD_BEDBUG
 
 #endif /* __CONFIG_H */
 
  * (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
 
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_BEDBUG
 CONFIG_CMD_BLOB
 CONFIG_CMD_BMODE
 CONFIG_CMD_BMP