diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 795dbcd212..c1d9fcbf6e 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-12  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-opc.h (CpuUnused): Defined with CpuMax.
+	(OTUnused): Defined with OTMax.
+
 2007-09-12  Jan Beulich  <jbeulich@novell.com>
 
 	* i386-opc.tbl: Add two-operand forms of blendvps, blendvpd, and
diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index 5e7dbca82c..f76b9863cd 100644
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -94,7 +94,7 @@
 
 /* If you get a compiler error for zero width of the unused field,
    comment it out.  */
-#define CpuUnused	(CpuNo64 + 1)
+#define CpuUnused	(CpuMax + 1)
 
 /* We can check if an instruction is available with array instead
    of bitfield. */
@@ -334,7 +334,7 @@ typedef struct i386_opcode_modifier
 /* If you get a compiler error for zero width of the unused field,
    comment it out.  */
 #if 0
-#define OTUnused		(RegMem + 1)
+#define OTUnused		(OTMax + 1)
 #endif
 
 typedef union i386_operand_type