diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 74d15ae33d..08ea00a313 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -3,16 +3,16 @@
 choice
 	prompt "uClibc Version"
 	depends on TOOLCHAINOPTS && USE_UCLIBC
-	default UCLIBC_VERSION_0_9_33
+	default UCLIBC_USE_VERSION_0_9_33
 	help
 	  Select the version of uClibc you wish to use.
 
-	config UCLIBC_VERSION_0_9_33
+	config UCLIBC_USE_VERSION_0_9_33
+		select UCLIBC_VERSION_0_9_33
 		bool "uClibc 0.9.33.2"
 
 endchoice
 
-
 # Debug version.
 
 config UCLIBC_ENABLE_DEBUG
diff --git a/toolchain/uClibc/Config.version b/toolchain/uClibc/Config.version
index 0d0b4a76a3..dd302f256b 100644
--- a/toolchain/uClibc/Config.version
+++ b/toolchain/uClibc/Config.version
@@ -4,10 +4,6 @@ config UCLIBC_VERSION
 	default "0.9.33.2"       if UCLIBC_VERSION_0_9_33
 	default "0.9.33.2"
 
-if !TOOLCHAINOPTS
-
-	config UCLIBC_VERSION_0_9_33
-		default y if USE_UCLIBC
-		bool
-
-endif
+config UCLIBC_VERSION_0_9_33
+	default y if !TOOLCHAINOPTS && USE_UCLIBC
+	bool