diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 5474c8569..71ea157ba 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-01  Nick Clifton  <nickc@redhat.com>
+
+	* avr.h (AVR_ISA_AVR6): Fix typo, adding AVR_ISA_SPMX.
+
 2011-06-18  Robin Getz  <robin.getz@analog.com>
 
 	* bfin.h (is_macmod_signed): New func
diff --git a/include/opcode/avr.h b/include/opcode/avr.h
index c754234bd..cc03c8018 100644
--- a/include/opcode/avr.h
+++ b/include/opcode/avr.h
@@ -68,7 +68,7 @@
 #define AVR_ISA_AVR6   (AVR_ISA_1200 | AVR_ISA_LPM | AVR_ISA_LPMX | \
                         AVR_ISA_SRAM | AVR_ISA_MEGA | AVR_ISA_MUL | \
                         AVR_ISA_ELPM | AVR_ISA_ELPMX | AVR_ISA_SPM | \
-                        AVR_ISA_SPM | AVR_ISA_BRK | AVR_ISA_EIND | \
+                        AVR_ISA_SPMX | AVR_ISA_BRK | AVR_ISA_EIND | \
                         AVR_ISA_MOVW)
 
 #define REGISTER_P(x) ((x) == 'r'		\