diff --git a/Config.in b/Config.in
index c348dc4b8..dc589ff1e 100644
--- a/Config.in
+++ b/Config.in
@@ -10,6 +10,8 @@ config BR2_VERSION
 	string
 	default "0.10.0-svn"
 
+source "project/Config.in"
+
 source "target/arch.in"
 
 menu "Build options"
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
index be2306f68..1574cf2f0 100644
--- a/package/busybox/Config.in
+++ b/package/busybox/Config.in
@@ -127,6 +127,8 @@ config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 	  Do not show packages in menuconfig that are potentially provided
 	  by busybox.
 
+comment "Skeleton configuration"
+
 config BR2_PACKAGE_BUSYBOX_SKELETON
 	bool "use minimal target skeleton"
 	depends on BR2_PACKAGE_BUSYBOX
@@ -135,6 +137,19 @@ config BR2_PACKAGE_BUSYBOX_SKELETON
 	  Use a minimal target skeleton. Make sure to select mdev
 	  which is used to populate /dev/.
 
+config BR2_HOSTNAME
+	string "hostname"
+	default "uclibc"
+	help
+	  The hostname string is stored in "/etc/hostname"
+
+config BR2_BANNER
+	string "banner"
+	default "Welcome to the Erik's uClibc development environment."
+	help
+	  The banner string is stored in "/etc/issue"
+
+
 #config BR2_PACKAGE_BUSYBOX_INITRAMFS
 #	bool "initramfs perusing busybox"
 #	depends on BR2_PACKAGE_BUSYBOX
diff --git a/project/Config.in b/project/Config.in
index e5927c2e3..a355623b5 100644
--- a/project/Config.in
+++ b/project/Config.in
@@ -1,4 +1,4 @@
-comment "Project Options"
+menu "Project Options"
 
 config BR2_PROJECT
 	string "Project name"
@@ -11,15 +11,4 @@ config BR2_PROJECT
 	  Older targets may still build in the build_<arch>
 	  and store binaries in the top directory.
 
-config BR2_HOSTNAME
-	string "hostname"
-	default "uclibc"
-	help
-	  The hostname string is stored in "/etc/hostname"
-
-config BR2_BANNER
-	string "banner"
-	default "Welcome to the Erik's uClibc development environment."
-	help
-	  The banner string is stored in "/etc/issue"
-
+endmenu
diff --git a/target/arch.in b/target/arch.in
index 7a75044cc..9d56548bb 100644
--- a/target/arch.in
+++ b/target/arch.in
@@ -108,18 +108,6 @@ config BR2_ARM_TYPE
 	default ARM_XSCALE	if BR2_xscale
 	default ARM_IWMMXT	if BR2_iwmmxt
 
-choice
-	prompt "Target ABI"
-	depends BR2_arm || BR2_armeb
-	default BR2_ARM_OABI
-	help
-	  Application Binary Interface to use
-
-config BR2_ARM_OABI
-	bool "OABI"
-config BR2_ARM_EABI
-	bool "EABI"
-endchoice
 
 choice
 	prompt "Target Architecture Variant"
@@ -635,24 +623,3 @@ config BR2_GCC_TARGET_ARCH
 	default z990		if BR2_s390_z990
 	default z9-109		if BR2_s390_z9_109
 
-config BR2_GCC_TARGET_ABI
-	string
-	default apcs-gnu	if BR2_arm_dunno
-	default atpcs		if BR2_arm_dunno
-	default aapcs		if BR2_arm_dunno
-	default aapcs-linux	if BR2_arm_dunno
-	default iwmmxt		if BR2_iwmmxt
-	default 32		if BR2_mipsel && BR2_OABI
-	default n32		if BR2_mipsel && BR2_EABI
-	default o64		if BR2_mips && BR2_OABI
-	default 64		if BR2_mips && BR2_ABI64
-	default eabi		if BR2_mips && BR2_EABI
-	default mmixware	if BR2_mmix && BR2_ABI_native
-	default gnu		if BR2_mmix && !BR2_ABI_native
-	default altivec		if BR2_powerpc && BR2_ABI_altivec
-	default no-altivec	if BR2_powerpc && BR2_ABI_no-altivec
-	default spe		if BR2_powerpc && BR2_ABI_spe
-	default no-spe		if BR2_powerpc && BR2_ABI_no-spe
-	default ibmlongdouble	if BR2_powerpc && BR2_ABI_ibmlongdouble
-	default ieeelongdouble	if BR2_powerpc && BR2_ABI_ieeelongdouble
-
diff --git a/target/device/Config.in b/target/device/Config.in
index 3b7fead8b..94d16037f 100644
--- a/target/device/Config.in
+++ b/target/device/Config.in
@@ -1,7 +1,5 @@
 menu "Board Support Options"
 
-source "project/Config.in"
-
 comment "Preset Devices"
 
 source "target/device/AMD/Config.in"
diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 93c7a4de5..07cea045c 100644
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -69,6 +69,40 @@ config BR2_GCC_VERSION
 	default "4.2.1"     if BR2_GCC_VERSION_4_2_1
 	default "4.3"       if BR2_GCC_VERSION_4_3
 
+choice
+	prompt "Target ABI"
+	depends BR2_arm || BR2_armeb
+	default BR2_ARM_OABI
+	help
+	  Application Binary Interface to use
+
+config BR2_ARM_OABI
+	bool "OABI"
+config BR2_ARM_EABI
+	bool "EABI"
+endchoice
+
+config BR2_GCC_TARGET_ABI
+	string
+	default apcs-gnu	if BR2_arm_dunno
+	default atpcs		if BR2_arm_dunno
+	default aapcs		if BR2_arm_dunno
+	default aapcs-linux	if BR2_arm_dunno
+	default iwmmxt		if BR2_iwmmxt
+	default 32		if BR2_mipsel && BR2_OABI
+	default n32		if BR2_mipsel && BR2_EABI
+	default o64		if BR2_mips && BR2_OABI
+	default 64		if BR2_mips && BR2_ABI64
+	default eabi		if BR2_mips && BR2_EABI
+	default mmixware	if BR2_mmix && BR2_ABI_native
+	default gnu		if BR2_mmix && !BR2_ABI_native
+	default altivec		if BR2_powerpc && BR2_ABI_altivec
+	default no-altivec	if BR2_powerpc && BR2_ABI_no-altivec
+	default spe		if BR2_powerpc && BR2_ABI_spe
+	default no-spe		if BR2_powerpc && BR2_ABI_no-spe
+	default ibmlongdouble	if BR2_powerpc && BR2_ABI_ibmlongdouble
+	default ieeelongdouble	if BR2_powerpc && BR2_ABI_ieeelongdouble
+
 config BR2_TOOLCHAIN_SYSROOT
 	bool "Enable toolchain with --sysroot support"
 	depends on BR2_GCC_SUPPORTS_SYSROOT