--- binutils-2.17/gas/config/tc-avr.c	2007-08-21 16:24:10.000000000 +0200
+++ binutils-2.17_orig/gas/config/tc-avr.c	2007-08-21 16:20:54.000000000 +0200
@@ -114,6 +114,8 @@
   {"at90pwm1",   AVR_ISA_PWMx,    bfd_mach_avr4},
   {"at90pwm2",  AVR_ISA_PWMx,     bfd_mach_avr4},
   {"at90pwm3",  AVR_ISA_PWMx,     bfd_mach_avr4},
+  {"at90pwm216", AVR_ISA_PWMx16,  bfd_mach_avr5},
+  {"at90pwm316", AVR_ISA_PWMx16,  bfd_mach_avr5},
   {"atmega16",  AVR_ISA_M323,     bfd_mach_avr5},
   {"atmega161", AVR_ISA_M161,     bfd_mach_avr5},
   {"atmega162", AVR_ISA_M323,     bfd_mach_avr5},
--- binutils-2.17/include/opcode/avr.h	2007-08-22 10:46:30.000000000 +0200
+++ binutils-2.17/include/opcode/avr.h_	2007-08-22 10:47:32.000000000 +0200
@@ -33,6 +33,7 @@
 
 #define AVR_ISA_TINY1 (AVR_ISA_1200 | AVR_ISA_LPM)
 #define AVR_ISA_PWMx  (AVR_ISA_M8   | AVR_ISA_BRK)
+#define AVR_ISA_PWMx16 (AVR_ISA_PWMx | AVR_ISA_MEGA )
 #define AVR_ISA_2xxx  (AVR_ISA_TINY1 | AVR_ISA_SRAM)
 #define AVR_ISA_TINY2 (AVR_ISA_2xxx | AVR_ISA_MOVW | AVR_ISA_LPMX | \
                        AVR_ISA_SPM  | AVR_ISA_BRK)