diff --git a/cmd/Kconfig b/cmd/Kconfig
index fbedf9895789f52a0bb42c75170565fec247c518..5719a6143243eed5958bfd684f5fc3e6a8316cc7 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1415,6 +1415,17 @@ config CMD_YAFFS2
 	  that device writes are sequential regardless of filesystem
 	  activity.
 
+config CMD_ZFS
+	bool "zfs - Access of ZFS filesystem"
+	help
+	  This provides commands to accessing a ZFS filesystem, commonly used
+	  on Solaris systems. Two sub-commands are provided:
+
+	    zfsls - list files in a directory
+	    zfsload - load a file
+
+	  See doc/README.zfs for more details.
+
 endmenu
 
 menu "Debug commands"
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index faddca88cd578a44d5974f247fc2adc7d438d617..df88df42e1491fb3c252d20435bc05b6a67b1dc8 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,6 +13,4 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_ZFS		/* ZFS Support			*/
-
 #endif	/* _CONFIG_CMD_ALL_H */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 631a5fa13d0cc992d4abc5bb2c822e2c36f5576a..9ab5d4d95839abe20fa78d6d06b812273ab3b005 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_ZFS
 CONFIG_CM_INIT
 CONFIG_CM_MULTIPLE_SSRAM
 CONFIG_CM_REMAP