diff --git a/gas/ChangeLog b/gas/ChangeLog
index 1b2e47b6a1..b3f610e859 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-05  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (build_modrm_byte): Check the first 2 8bit
+	immediate operands directly for instructions with 4 operands.
+
 2007-10-04  H.J. Lu  <hongjiu.lu@intel.com>
 
 	PR gas/5109
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 56bf31f69c..a1f60edc9a 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4421,11 +4421,12 @@ build_modrm_byte (void)
 	    source = 0;
 	  break;
 	case 4:
-	  /* When there are 4 operands, the first two must be immediate
-	     operands. The source operand will be the 3rd one.  */
+	  /* When there are 4 operands, the first two must be 8bit
+	     immediate operands. The source operand will be the 3rd
+	     one.  */
 	  assert (i.imm_operands == 2
-		  && operand_type_check (i.types[0], imm)
-		  && operand_type_check (i.types[1], imm));
+		  && i.types[0].bitfield.imm8
+		  && i.types[1].bitfield.imm8);
 	  source = 2;
 	  break;
 	default: