diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 50ee615a04a75b376d227dc693311d8743020d65..2ce5de361867353bf0bfa921fd7ada716e875182 100644
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -3,15 +3,17 @@
 choice
 	prompt "Binutils Version" if TOOLCHAINOPTS
 	default BINUTILS_VERSION_2_19_1 if ubicom32
-	default BINUTILS_VERSION_2_20_1
+	default BINUTILS_VERSION_2_20_1 if avr32
+	default BINUTILS_VERSION_2_22
 	help
 	  Select the version of binutils you wish to use.
 
 	config BINUTILS_VERSION_2_19_1
+		depends ubicom32
 		bool "binutils 2.19.1"
 
 	config BINUTILS_VERSION_2_20_1
-		depends !ubicom32
+		depends avr32
 		bool "binutils 2.20.1"
 
 	config BINUTILS_VERSION_2_21
@@ -47,4 +49,5 @@ config BINUTILS_VERSION
 	default "2.21.1"          if BINUTILS_VERSION_2_21_1
 	default "2.22"            if BINUTILS_VERSION_2_22
 	default "2.19.1"          if ubicom32
-	default "2.20.1"
+	default "2.20.1"          if avr32
+	default "2.22"