diff --git a/gas/ChangeLog b/gas/ChangeLog
index d57e76a19aa..816ce34a5cd 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (build_modrm_byte): Check XOP2SOURCES
+	instead VEX2SOURCES.
+
 2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386.c (process_operands): Check vexsources 
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index eb99accd032..0ddf8711262 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -5311,7 +5311,7 @@ build_modrm_byte (void)
       else
 	mem = ~0;
 
-      if (i.tm.opcode_modifier.vexsources == VEX2SOURCES)
+      if (i.tm.opcode_modifier.vexsources == XOP2SOURCES)
 	{
 	  if (operand_type_check (i.types[0], imm))
 	    i.vex.register_specifier = NULL;
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 01d250e4119..fb780a16360 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* i386-opc.h (VEX2SOURCES): Renamed to ...
+	(XOP2SOURCES): This.
+
 2009-12-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* i386-gen.c (opcode_modifiers): Remove Vex3Sources and
diff --git a/opcodes/i386-opc.h b/opcodes/i386-opc.h
index 08fe068cb06..afed367ab6f 100644
--- a/opcodes/i386-opc.h
+++ b/opcodes/i386-opc.h
@@ -307,11 +307,11 @@ enum
   /* insn has XOP 0x0A opcode prefix. */
   XOP0A,
   /* number of VEX source operands:
-     0: < 2 source operands.
-     1: 2 source operands.
+     0: <= 2 source operands.
+     1: 2 XOP source operands.
      2: 3 source operands.
    */
-#define VEX2SOURCES	1
+#define XOP2SOURCES	1
 #define VEX3SOURCES	2
   VexSources,
   /* instruction has VEX 8 bit imm */