diff --git a/toolchain/Config.in b/toolchain/Config.in
index 9df7447c93..7401578709 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -1,7 +1,8 @@
 menu "Toolchain"
 choice
 	prompt "Toolchain type"
-	default BR2_TOOLCHAIN_BUILDROOT 
+	default BR2_TOOLCHAIN_BUILDROOT if !BR2_avr32
+	default BR2_TOOLCHAIN_EXTERNAL_SOURCE if BR2_avr32
 	help
 	  Select whether to use the toolchain provided by buildroot
 	  or an external toolchain.
@@ -11,6 +12,7 @@ choice
 
 config BR2_TOOLCHAIN_BUILDROOT
 	bool "Buildroot toolchain"
+	depends on !BR2_avr32
   
 config BR2_TOOLCHAIN_EXTERNAL
 	bool "External binary toolchain"