diff --git a/Kconfig b/Kconfig
index cbb691e..fc5e7cd 100644
--- a/Kconfig
+++ b/Kconfig
@@ -91,7 +91,7 @@
 	depends on !SPL_BUILD
 	help
 	  The old configuration infrastructure (= mkconfig + boards.cfg)
-	  provided the extra options field. It you have something like
+	  provided the extra options field. If you have something like
 	  "HAS_BAR,BAZ=64", the optional options
 	    #define CONFIG_HAS
 	    #define CONFIG_BAZ	64
@@ -103,3 +103,13 @@
 endmenu		# Boot images
 
 source "arch/Kconfig"
+
+source "common/Kconfig"
+
+source "net/Kconfig"
+
+source "drivers/Kconfig"
+
+source "fs/Kconfig"
+
+source "lib/Kconfig"
diff --git a/common/Kconfig b/common/Kconfig
new file mode 100644
index 0000000..5ae7190
--- /dev/null
+++ b/common/Kconfig
@@ -0,0 +1,4 @@
+menu "Command line interface"
+	depends on !SPL_BUILD
+
+endmenu
diff --git a/drivers/Kconfig b/drivers/Kconfig
new file mode 100644
index 0000000..128736d
--- /dev/null
+++ b/drivers/Kconfig
@@ -0,0 +1,51 @@
+menu "Device Drivers"
+
+source "drivers/core/Kconfig"
+
+source "drivers/pci/Kconfig"
+
+source "drivers/pcmcia/Kconfig"
+
+source "drivers/mtd/Kconfig"
+
+source "drivers/block/Kconfig"
+
+source "drivers/misc/Kconfig"
+
+source "drivers/net/Kconfig"
+
+source "drivers/input/Kconfig"
+
+source "drivers/serial/Kconfig"
+
+source "drivers/tpm/Kconfig"
+
+source "drivers/i2c/Kconfig"
+
+source "drivers/spi/Kconfig"
+
+source "drivers/gpio/Kconfig"
+
+source "drivers/power/Kconfig"
+
+source "drivers/hwmon/Kconfig"
+
+source "drivers/watchdog/Kconfig"
+
+source "drivers/video/Kconfig"
+
+source "drivers/sound/Kconfig"
+
+source "drivers/usb/Kconfig"
+
+source "drivers/dfu/Kconfig"
+
+source "drivers/mmc/Kconfig"
+
+source "drivers/rtc/Kconfig"
+
+source "drivers/dma/Kconfig"
+
+source "drivers/crypto/Kconfig"
+
+endmenu
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/block/Kconfig
diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/core/Kconfig
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/crypto/Kconfig
diff --git a/drivers/dfu/Kconfig b/drivers/dfu/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/dfu/Kconfig
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/dma/Kconfig
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/gpio/Kconfig
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/hwmon/Kconfig
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/i2c/Kconfig
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/input/Kconfig
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/misc/Kconfig
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/mmc/Kconfig
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/mtd/Kconfig
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/net/Kconfig
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/pci/Kconfig
diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/pcmcia/Kconfig
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/power/Kconfig
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/rtc/Kconfig
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/serial/Kconfig
diff --git a/drivers/sound/Kconfig b/drivers/sound/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/sound/Kconfig
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/spi/Kconfig
diff --git a/drivers/tpm/Kconfig b/drivers/tpm/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/tpm/Kconfig
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/usb/Kconfig
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/video/Kconfig
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/drivers/watchdog/Kconfig
diff --git a/fs/Kconfig b/fs/Kconfig
new file mode 100644
index 0000000..41bb0b9
--- /dev/null
+++ b/fs/Kconfig
@@ -0,0 +1,19 @@
+#
+# File system configuration
+#
+
+menu "File systems"
+
+source "fs/ext4/Kconfig"
+
+source "fs/reiserfs/Kconfig"
+
+source "fs/fat/Kconfig"
+
+source "fs/jffs2/Kconfig"
+
+source "fs/ubifs/Kconfig"
+
+source "fs/cramfs/Kconfig"
+
+endmenu
diff --git a/fs/cramfs/Kconfig b/fs/cramfs/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/fs/cramfs/Kconfig
diff --git a/fs/ext4/Kconfig b/fs/ext4/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/fs/ext4/Kconfig
diff --git a/fs/fat/Kconfig b/fs/fat/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/fs/fat/Kconfig
diff --git a/fs/jffs2/Kconfig b/fs/jffs2/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/fs/jffs2/Kconfig
diff --git a/fs/reiserfs/Kconfig b/fs/reiserfs/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/fs/reiserfs/Kconfig
diff --git a/fs/ubifs/Kconfig b/fs/ubifs/Kconfig
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/fs/ubifs/Kconfig
diff --git a/lib/Kconfig b/lib/Kconfig
new file mode 100644
index 0000000..9724eb8
--- /dev/null
+++ b/lib/Kconfig
@@ -0,0 +1,3 @@
+menu "Library routines"
+
+endmenu
diff --git a/net/Kconfig b/net/Kconfig
new file mode 100644
index 0000000..22b9eaa
--- /dev/null
+++ b/net/Kconfig
@@ -0,0 +1,10 @@
+#
+# Network configuration
+#
+
+menuconfig NET
+	bool "Networking support"
+
+if NET
+
+endif   # if NET