diff -Naurp binutils/size.c binutils/size.c
--- binutils/size.c	2012-05-24 11:34:25.000000000 +0530
+++ binutils/size.c	2012-05-24 11:34:53.000000000 +0530
@@ -121,6 +121,7 @@ avr_device_t avr[] =
 {
 	{"atxmega256a3",  AVR264K, AVR16K, AVR4K},
 	{"atxmega256a3b", AVR264K, AVR16K, AVR4K},
+	{"atxmega256a3bu",AVR264K, AVR16K, AVR4K},
 	{"atxmega256d3",  AVR264K, AVR16K, AVR4K},
 
 	{"atmega2560",    AVR256K, AVR8K,  AVR4K},
@@ -132,6 +133,7 @@ avr_device_t avr[] =
 	{"atxmega128a1",  AVR136K, AVR8K,  AVR2K},
 	{"atxmega128a1u", AVR136K, AVR8K,  AVR2K},
 	{"atxmega128a3",  AVR136K, AVR8K,  AVR2K},
+	{"atxmega128b1",  AVR136K, AVR8K,  AVR2K},
 	{"atxmega128d3",  AVR136K, AVR8K,  AVR2K},
 
 	{"at43usb320",    AVR128K, 608UL,  0UL},
diff -Naurp gas/config/tc-avr.c gas/config/tc-avr.c
--- gas/config/tc-avr.c	2012-05-24 11:34:25.000000000 +0530
+++ gas/config/tc-avr.c	2012-05-24 11:39:23.000000000 +0530
@@ -265,7 +265,7 @@ static struct mcu_type_s mcu_types[] =
   {"atxmega64a1", AVR_ISA_XMEGA,  bfd_mach_avrxmega5},
   {"atxmega64a1u",AVR_ISA_XMEGA,  bfd_mach_avrxmega5},
   {"atxmega128a3", AVR_ISA_XMEGA, bfd_mach_avrxmega6},
-  {"atxmega128b1", AVR_ISA_XMEGA, bfd_mach_avrxmega6},
+  {"atxmega128b1", AVR_ISA_XMEGAU, bfd_mach_avrxmega6},
   {"atxmega128d3", AVR_ISA_XMEGA, bfd_mach_avrxmega6},
   {"atxmega192a3", AVR_ISA_XMEGA, bfd_mach_avrxmega6},
   {"atxmega192d3", AVR_ISA_XMEGA, bfd_mach_avrxmega6},
@@ -453,6 +453,7 @@ md_show_usage (FILE *stream)
 	"                   avr5  - enhanced AVR core with up to 64K program memory\n"
 	"                   avr51 - enhanced AVR core with up to 128K program memory\n"
 	"                   avr6  - enhanced AVR core with up to 256K program memory\n"
+	"                   avrxmega2 - XMEGA, > 8K, < 64K FLASH, < 64K RAM\n"
 	"                   avrxmega3 - XMEGA, > 8K, <= 64K FLASH, > 64K RAM\n"
 	"                   avrxmega4 - XMEGA, > 64K, <= 128K FLASH, <= 64K RAM\n"
 	"                   avrxmega5 - XMEGA, > 64K, <= 128K FLASH, > 64K RAM\n"
diff -Naurp gas/doc/c-avr.texi gas/doc/c-avr.texi
--- gas/doc/c-avr.texi	2012-05-24 11:12:14.000000000 +0530
+++ gas/doc/c-avr.texi	2012-05-24 11:34:53.000000000 +0530
@@ -103,7 +103,7 @@ atxmega64a1u).
 Instruction set avrxmega6 is for the XMEGA AVR core with up to 256K program
 memory space and less than 64K data space (MCU types: atxmega128a3,
 atxmega128d3, atxmega192a3, atxmega128b1, atxmega192d3, atxmega256a3, 
-atxmega256a3b, atxmega256a3bu, atxmega192d3).
+atxmega256a3b, atxmega256a3bu).
 
 Instruction set avrxmega7 is for the XMEGA AVR core with up to 256K program
 memory space and greater than 64K data space (MCU types: atxmega128a1,
diff -Naurp ld/Makefile.am ld/Makefile.am
--- ld/Makefile.am	2012-05-24 11:12:14.000000000 +0530
+++ ld/Makefile.am	2012-05-24 11:34:53.000000000 +0530
@@ -163,13 +163,13 @@ ALL_EMULATION_SOURCES = \
 	eavr5.c \
 	eavr51.c \
 	eavr6.c \
-	eavrxmega1.o \
-	eavrxmega2.o \
-	eavrxmega3.o \
-	eavrxmega4.o \
-	eavrxmega5.o \
-	eavrxmega6.o \
-	eavrxmega7.o \
+	eavrxmega1.c \
+	eavrxmega2.c \
+	eavrxmega3.c \
+	eavrxmega4.c \
+	eavrxmega5.c \
+	eavrxmega6.c \
+	eavrxmega7.c \
 	ecoff_i860.c \
 	ecoff_sparc.c \
 	ecrisaout.c \
diff -Naurp ld/Makefile.in ld/Makefile.in
--- ld/Makefile.in	2012-05-24 11:12:14.000000000 +0530
+++ ld/Makefile.in	2012-05-24 11:34:53.000000000 +0530
@@ -469,13 +469,13 @@ ALL_EMULATION_SOURCES = \
 	eavr5.c \
 	eavr51.c \
 	eavr6.c \
-	eavrxmega1.o \
-	eavrxmega2.o \
-	eavrxmega3.o \
-	eavrxmega4.o \
-	eavrxmega5.o \
-	eavrxmega6.o \
-	eavrxmega7.o \
+	eavrxmega1.c \
+	eavrxmega2.c \
+	eavrxmega3.c \
+	eavrxmega4.c \
+	eavrxmega5.c \
+	eavrxmega6.c \
+	eavrxmega7.c \
 	ecoff_i860.c \
 	ecoff_sparc.c \
 	ecrisaout.c \