diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index 919f2059d..86b03c717 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-03  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386.h (MAX_OPERANDS): Set to 5.
+	(MAX_MNEM_SIZE): Changed to 20.
+
 2008-03-09  Paul Brook  <paul@codesourcery.com>
 
 	* arm.h (FPU_VFP_EXT_D32, FPU_VFP_V3D16, FPU_ARCH_VFP_V3D16): Define.
diff --git a/include/opcode/i386.h b/include/opcode/i386.h
index 4fe769a58..f59eeeaff 100644
--- a/include/opcode/i386.h
+++ b/include/opcode/i386.h
@@ -100,7 +100,7 @@
 #define REX_B	1
 
 /* max operands per insn */
-#define MAX_OPERANDS 4
+#define MAX_OPERANDS 5
 
 /* max immediates per insn (lcall, ljmp, insertq, extrq) */
 #define MAX_IMMEDIATE_OPERANDS 2
@@ -109,7 +109,7 @@
 #define MAX_MEMORY_OPERANDS 2
 
 /* max size of insn mnemonics.  */
-#define MAX_MNEM_SIZE 16
+#define MAX_MNEM_SIZE 20
 
 /* max size of register name in insn mnemonics.  */
 #define MAX_REG_NAME_SIZE 8