diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp
index 7afa7e66d5e..37334ad4ceb 100644
--- a/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -979,6 +979,16 @@ ParseInstruction(StringRef Name, SMLoc NameLoc,
                                                NameLoc, NameLoc));
   }
   
+  // lcall *x  and ljmp *x  -> lcalll and ljmpl
+  if ((Name == "lcall" || Name == "ljmp") &&
+      Operands.size() == 3 &&
+      static_cast<X86Operand*>(Operands[1])->isToken() &&
+      static_cast<X86Operand*>(Operands[1])->getToken() == "*") {
+    delete Operands[0];
+    Operands[0] = X86Operand::CreateToken(Name == "lcall" ? "lcalll" : "ljmpl",
+                                          NameLoc);
+  }
+  
   return false;
 }
 
diff --git a/test/MC/AsmParser/X86/x86_instructions.s b/test/MC/AsmParser/X86/x86_instructions.s
index 16b1aac6193..092aff3b48b 100644
--- a/test/MC/AsmParser/X86/x86_instructions.s
+++ b/test/MC/AsmParser/X86/x86_instructions.s
@@ -288,3 +288,9 @@ shrd	$1, %bx,%bx
 sldt	%ecx
 sldt	%cx
 
+// CHECK: lcalll	*3135175374 
+// CHECK: ljmpl	*3135175374
+lcall	*0xbadeface
+ljmp	*0xbadeface
+
+