--- gas/config/tc-avr.c	16 Nov 2007 17:39:22 -0000	1.48
+++ gas/config/tc-avr.c	3 Jan 2008 20:56:39 -0000
@@ -63,7 +63,7 @@ static struct mcu_type_s mcu_types[] =
 {
   {"avr1",       AVR_ISA_TINY1,   bfd_mach_avr1},
   {"avr2",       AVR_ISA_TINY2,   bfd_mach_avr2},
-  {"avr3",       AVR_ISA_M103,    bfd_mach_avr3},
+  {"avr3",       AVR_ISA_AVR3,    bfd_mach_avr3},
   {"avr4",       AVR_ISA_M8,      bfd_mach_avr4},
   {"avr5",       AVR_ISA_ALL,     bfd_mach_avr5},
   {"avr6",       AVR_ISA_ALL,     bfd_mach_avr6},
@@ -102,6 +102,8 @@ static struct mcu_type_s mcu_types[] =
   {"at43usb320", AVR_ISA_M103,    bfd_mach_avr3},
   {"at43usb355", AVR_ISA_M603,    bfd_mach_avr3},
   {"at76c711",   AVR_ISA_M603,    bfd_mach_avr3},
+  {"at90usb82",  AVR_ISA_USB162,  bfd_mach_avr3},
+  {"at90usb162", AVR_ISA_USB162,  bfd_mach_avr3},
   {"atmega48",   AVR_ISA_PWMx,    bfd_mach_avr4},
   {"atmega48p",  AVR_ISA_PWMx,    bfd_mach_avr4},
   {"atmega8",    AVR_ISA_M8,      bfd_mach_avr4},
@@ -150,8 +152,6 @@ static struct mcu_type_s mcu_types[] =
   {"at90can32" , AVR_ISA_M323,    bfd_mach_avr5},
   {"at90can64" , AVR_ISA_M323,    bfd_mach_avr5},
   {"at90can128", AVR_ISA_M128,    bfd_mach_avr5},
-  {"at90usb82",  AVR_ISA_M323,    bfd_mach_avr5},
-  {"at90usb162", AVR_ISA_M323,    bfd_mach_avr5},
   {"at90usb646", AVR_ISA_M323,    bfd_mach_avr5},
   {"at90usb647", AVR_ISA_M323,    bfd_mach_avr5},
   {"at90usb1286",AVR_ISA_M128,    bfd_mach_avr5},
--- gas/doc/c-avr.texi.orig	2008-03-06 21:15:22.000000000 +0100
+++ gas/doc/c-avr.texi	2008-03-06 21:15:26.000000000 +0100
@@ -45,7 +45,7 @@ attiny45, attiny85).
 
 Instruction set avr3 is for the classic AVR core with up to 128K program
 memory space (MCU types: atmega103, atmega603, at43usb320, at43usb355,
-at76c711).
+at76c711, at90usb82, at90usb162).
 
 Instruction set avr4 is for the enhanced AVR core with up to 8K program
 memory space (MCU types: atmega48, atmega8, atmega83, atmega85, atmega88,
@@ -58,8 +58,8 @@ atmega32, atmega323, atmega324p, atmega3
 atmega329p, atmega3250, atmega3250p, atmega3290, atmega3290p, atmega406, 
 atmega64, atmega640, atmega644, atmega644p, atmega128, atmega1280, 
 atmega1281, atmega645, atmega649, atmega6450, atmega6490, atmega16hva, 
-at90can32, at90can64, at90can128, at90usb82, at90usb162, at90usb646, 
-at90usb647, at90usb1286, at90usb1287, at94k).
+at90can32, at90can64, at90can128, at90usb646, at90usb647, at90usb1286,
+at90usb1287, at94k).
 
 Instruction set avr6 is for the enhanced AVR core with 256K program
 memory space (MCU types: atmega2560, atmega2561).
--- include/opcode/avr.h	7 Apr 2006 15:18:08 -0000	1.9
+++ include/opcode/avr.h	3 Jan 2008 20:56:40 -0000
@@ -40,6 +40,10 @@
                        AVR_ISA_LPMX | AVR_ISA_SPM)
 #define AVR_ISA_M603  (AVR_ISA_2xxx | AVR_ISA_MEGA)
 #define AVR_ISA_M103  (AVR_ISA_M603 | AVR_ISA_ELPM)
+#define AVR_ISA_USB162 (AVR_ISA_M603 | AVR_ISA_MOVW | \
+                       AVR_ISA_LPMX | AVR_ISA_SPM)
+#define AVR_ISA_AVR3 (AVR_ISA_M603 | AVR_ISA_MOVW | \
+                       AVR_ISA_LPMX | AVR_ISA_SPM  | AVR_ISA_ELPM)
 #define AVR_ISA_M161  (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \
                        AVR_ISA_LPMX | AVR_ISA_SPM)
 #define AVR_ISA_94K   (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW |
AVR_ISA_LPMX)