diff --git a/Kconfig b/Kconfig
index 79c5212925..8c70e9ac6a 100644
--- a/Kconfig
+++ b/Kconfig
@@ -30,47 +30,6 @@ config LOCALVERSION
         help
 	  Append an extra string to the end of the LinuxBIOS version.
 
-choice
-	prompt "ROM chip size"
-	default LINUXBIOS_ROMSIZE_KB_256
-
-config LINUXBIOS_ROMSIZE_KB_128
-	bool "128 KB"
-	help
-	  Choose this option if you have a 128 KB ROM chip.
-
-config LINUXBIOS_ROMSIZE_KB_256
-	bool "256 KB"
-	help
-	  Choose this option if you have a 256 KB ROM chip.
-
-config LINUXBIOS_ROMSIZE_KB_512
-	bool "512 KB"
-	help
-	  Choose this option if you have a 512 KB ROM chip.
-
-config LINUXBIOS_ROMSIZE_KB_1024
-	bool "1024 KB (1 MB)"
-	help
-	  Choose this option if you have a 1 MB (1024 KB) ROM chip.
-
-config LINUXBIOS_ROMSIZE_KB_2048
-	bool "2048 KB (2 MB)"
-	help
-	  Choose this option if you have a 2 MB (2048 KB) ROM chip.
-
-endchoice
-
-config LINUXBIOS_ROMSIZE_KB
-	int
-	default 128 if LINUXBIOS_ROMSIZE_KB_128
-	default 256 if LINUXBIOS_ROMSIZE_KB_256
-	default 512 if LINUXBIOS_ROMSIZE_KB_512
-	default 1024 if LINUXBIOS_ROMSIZE_KB_1024
-	default 2048 if LINUXBIOS_ROMSIZE_KB_2048
-	help
-	  Map the config names to an integer.
-
 endmenu
 
 source mainboard/Kconfig
diff --git a/lib/Kconfig b/lib/Kconfig
index a550ee9b8c..35e23bc883 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -1,4 +1,4 @@
-menu "Compression methods"
+menu "Compression"
 
 config COMPRESSION_LZMA
 	boolean "Support LZMA compression"
diff --git a/mainboard/Kconfig b/mainboard/Kconfig
index 81a8ddcdc7..0091546851 100644
--- a/mainboard/Kconfig
+++ b/mainboard/Kconfig
@@ -1,5 +1,7 @@
+menu "Mainboard"
+
 choice
-	prompt "Board vendor"
+	prompt "Mainboard vendor"
 	default EMULATION
 
 config VENDOR_EMULATION
@@ -11,3 +13,46 @@ endchoice
 
 source "mainboard/emulation/Kconfig"
 
+choice
+	prompt "ROM chip size"
+	default LINUXBIOS_ROMSIZE_KB_256
+
+config LINUXBIOS_ROMSIZE_KB_128
+	bool "128 KB"
+	help
+	  Choose this option if you have a 128 KB ROM chip.
+
+config LINUXBIOS_ROMSIZE_KB_256
+	bool "256 KB"
+	help
+	  Choose this option if you have a 256 KB ROM chip.
+
+config LINUXBIOS_ROMSIZE_KB_512
+	bool "512 KB"
+	help
+	  Choose this option if you have a 512 KB ROM chip.
+
+config LINUXBIOS_ROMSIZE_KB_1024
+	bool "1024 KB (1 MB)"
+	help
+	  Choose this option if you have a 1 MB (1024 KB) ROM chip.
+
+config LINUXBIOS_ROMSIZE_KB_2048
+	bool "2048 KB (2 MB)"
+	help
+	  Choose this option if you have a 2 MB (2048 KB) ROM chip.
+
+endchoice
+
+config LINUXBIOS_ROMSIZE_KB
+	int
+	default 128 if LINUXBIOS_ROMSIZE_KB_128
+	default 256 if LINUXBIOS_ROMSIZE_KB_256
+	default 512 if LINUXBIOS_ROMSIZE_KB_512
+	default 1024 if LINUXBIOS_ROMSIZE_KB_1024
+	default 2048 if LINUXBIOS_ROMSIZE_KB_2048
+	help
+	  Map the config names to an integer.
+
+endmenu
+
diff --git a/mainboard/emulation/Kconfig b/mainboard/emulation/Kconfig
index 0ff172f667..16ea7c06a4 100644
--- a/mainboard/emulation/Kconfig
+++ b/mainboard/emulation/Kconfig
@@ -1,5 +1,5 @@
 choice
-	prompt "Board model"
+	prompt "Mainboard model"
 	depends on VENDOR_EMULATION
 
 config BOARD_EMULATION_QEMU_X86