diff --git a/README b/README
index ca25849..cee8714 100644
--- a/README
+++ b/README
@@ -826,7 +826,6 @@
 		CONFIG_CMD_USB		* USB support
 		CONFIG_CMD_CDP		* Cisco Discover Protocol support
 		CONFIG_CMD_XIMG		  Load part of Multi Image
-		CONFIG_CMD_UUID		* Generate random UUID or GUID string
 
 		EXAMPLE: If you want all functions except of network
 		support you can write:
diff --git a/cmd/Kconfig b/cmd/Kconfig
index 1621531..b80aff9 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1122,6 +1122,17 @@
 	  is very simple with no special processing of characters. As with
 	  cu, you can press ~. (tilde followed by period) to exit.
 
+config CMD_UUID
+	bool "uuid, guid - generation of unique IDs"
+	help
+	  This enables two commands:
+
+	     uuid - generate random Universally Unique Identifier
+	     guid - generate Globally Unique Identifier based on random UUID
+
+	  The two commands are very similar except for the endianness of the
+	  output.
+
 endmenu
 
 config CMD_BOOTSTAGE
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 9350196..8b02d2e 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_UUID
 CONFIG_CMD_ZBOOT
 CONFIG_CMD_ZFS
 CONFIG_CM_INIT