diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 71ea157ba..5e30fbcd4 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-01  Eric B. Weddington  <eric.weddington@atmel.com>
+
+	* avr.h (AVR_ISA_AVR6): Remove AVR_ISA_SPMX as it was actually
+	a duplicate of AVR_ISA_SPM.
+
 2011-07-01  Nick Clifton  <nickc@redhat.com>
 
 	* avr.h (AVR_ISA_AVR6): Fix typo, adding AVR_ISA_SPMX.
diff --git a/include/opcode/avr.h b/include/opcode/avr.h
index cc03c8018..a6d7b478d 100644
--- a/include/opcode/avr.h
+++ b/include/opcode/avr.h
@@ -68,8 +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_SPMX | AVR_ISA_BRK | AVR_ISA_EIND | \
-                        AVR_ISA_MOVW)
+                        AVR_ISA_BRK | AVR_ISA_EIND | AVR_ISA_MOVW)
 
 #define REGISTER_P(x) ((x) == 'r'		\
 		       || (x) == 'd'		\