diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in
index 16b2be415f..9f3c7b3c73 100644
--- a/toolchain/uClibc/Config.in
+++ b/toolchain/uClibc/Config.in
@@ -5,6 +5,7 @@ comment "uClibc Options"
 
 choice
 	prompt "uClibc C library Version"
+	default BR2_UCLIBC_VERSION_0_9_31 if BR2_avr32 # 0.9.32 broken
 	default BR2_UCLIBC_VERSION_0_9_32
 	help
 	  Select the version of uClibc you wish to use.
@@ -18,6 +19,7 @@ choice
 
 	config BR2_UCLIBC_VERSION_0_9_32
 		bool "uClibc 0.9.32.x"
+		depends on !BR2_avr32
 
 	config BR2_UCLIBC_VERSION_SNAPSHOT
 		bool "daily snapshot"