diff --git a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
index 1d5ad4c052d..a1eb57c78f3 100644
--- a/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
+++ b/lib/Target/X86/Disassembler/X86DisassemblerDecoder.c
@@ -1491,6 +1491,9 @@ static int readVVVV(struct InternalInstruction* insn) {
   else
     return -1;
 
+  if (insn->mode != MODE_64BIT)
+    insn->vvvv &= 0x7;
+
   return 0;
 }
 
diff --git a/test/MC/Disassembler/X86/simple-tests.txt b/test/MC/Disassembler/X86/simple-tests.txt
index cfaeb06d724..a9e6f41a734 100644
--- a/test/MC/Disassembler/X86/simple-tests.txt
+++ b/test/MC/Disassembler/X86/simple-tests.txt
@@ -365,3 +365,6 @@
 
 # CHECK: testq $0, %rax
 0x48 0xa9 0x00 0x00 0x00 0x00
+
+# CHECK: vaddps	%xmm3, %xmm15, %xmm0
+0xc4 0xe1 0x00 0x58 0xc3
diff --git a/test/MC/Disassembler/X86/x86-32.txt b/test/MC/Disassembler/X86/x86-32.txt
index 24740f6c313..35015c67d0c 100644
--- a/test/MC/Disassembler/X86/x86-32.txt
+++ b/test/MC/Disassembler/X86/x86-32.txt
@@ -384,3 +384,6 @@
 
 # CHECK: movl %eax, 0
 0xa3 0x00 0x00 0x00 0x00
+
+# CHECK: vaddps	%xmm3, %xmm7, %xmm0
+0xc4 0xe1 0x00 0x58 0xc3