diff --git a/gas/testsuite/gas/i386/disassem.d b/gas/testsuite/gas/i386/disassem.d
new file mode 100644
index 0000000..32edab5
--- /dev/null
+++ b/gas/testsuite/gas/i386/disassem.d
@@ -0,0 +1,14 @@
+#objdump: -drw
+#name: ljmp and lcall with invalid modrm byte
+
+.*: +file format .*
+
+
+Disassembly of section \.text:
+
+0+ <\.text>:
+[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)  
+[ 	]*[a-f0-9]+:[ 	]*ef[ 	]*out    %eax,\(%dx\)
+[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)  
+[ 	]*[a-f0-9]+:[ 	]*d8[ 	]*\.byte 0xd8
+#pass
diff --git a/gas/testsuite/gas/i386/disassem.s b/gas/testsuite/gas/i386/disassem.s
new file mode 100644
index 0000000..cfa7f55
--- /dev/null
+++ b/gas/testsuite/gas/i386/disassem.s
@@ -0,0 +1,2 @@
+.byte 0xFF, 0xEF
+.byte 0xFF, 0xD8
diff --git a/gas/testsuite/gas/i386/i386.exp b/gas/testsuite/gas/i386/i386.exp
index e0589e4..b220ca8 100644
--- a/gas/testsuite/gas/i386/i386.exp
+++ b/gas/testsuite/gas/i386/i386.exp
@@ -269,6 +269,7 @@ if [expr ([istarget "i*86-*-*"] ||  [istarget "x86_64-*-*"]) && [gas_32_check]]
     run_list_test "mpx-inval-1" "-al"
     run_dump_test "mpx-add-bnd-prefix"
     run_dump_test "sha"
+    run_dump_test "disassem"
 
     # These tests require support for 8 and 16 bit relocs,
     # so we only run them for ELF and COFF targets.
@@ -556,6 +557,7 @@ if [expr ([istarget "i*86-*-*"] || [istarget "x86_64-*-*"]) && [gas_64_check]] t
     run_dump_test "x86-64-mpx-addr32"
     run_dump_test "x86-64-mpx-add-bnd-prefix"
     run_dump_test "x86-64-sha"
+    run_dump_test "x86-64-disassem"
 
     if { ![istarget "*-*-aix*"]
       && ![istarget "*-*-beos*"]
diff --git a/gas/testsuite/gas/i386/x86-64-disassem.d b/gas/testsuite/gas/i386/x86-64-disassem.d
new file mode 100644
index 0000000..32edab5
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-disassem.d
@@ -0,0 +1,14 @@
+#objdump: -drw
+#name: ljmp and lcall with invalid modrm byte
+
+.*: +file format .*
+
+
+Disassembly of section \.text:
+
+0+ <\.text>:
+[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)  
+[ 	]*[a-f0-9]+:[ 	]*ef[ 	]*out    %eax,\(%dx\)
+[ 	]*[a-f0-9]+:[ 	]*ff[ 	]*\(bad\)  
+[ 	]*[a-f0-9]+:[ 	]*d8[ 	]*\.byte 0xd8
+#pass
diff --git a/gas/testsuite/gas/i386/x86-64-disassem.s b/gas/testsuite/gas/i386/x86-64-disassem.s
new file mode 100644
index 0000000..8b3543a
--- /dev/null
+++ b/gas/testsuite/gas/i386/x86-64-disassem.s
@@ -0,0 +1,3 @@
+.byte 0xFF, 0xEF
+.byte 0xFF, 0xD8
+
diff --git a/opcodes/i386-dis.c b/opcodes/i386-dis.c
index 8e55724..2c28e52 100644
--- a/opcodes/i386-dis.c
+++ b/opcodes/i386-dis.c
@@ -715,6 +715,8 @@ enum
   MOD_8D = 0,
   MOD_C6_REG_7,
   MOD_C7_REG_7,
+  MOD_FF_REG_3,
+  MOD_FF_REG_5,
   MOD_0F01_REG_0,
   MOD_0F01_REG_1,
   MOD_0F01_REG_2,
@@ -3229,9 +3231,9 @@ static const struct dis386 reg_table[][8] = {
     { "incQ",	{ Evh1 } },
     { "decQ",	{ Evh1 } },
     { "call{T|}", { indirEv, BND } },
-    { "Jcall{T|}", { indirEp } },
+    { MOD_TABLE (MOD_FF_REG_3) },
     { "jmp{T|}", { indirEv, BND } },
-    { "Jjmp{T|}", { indirEp } },
+    { MOD_TABLE (MOD_FF_REG_5) },
     { "pushU",	{ stackEv } },
     { Bad_Opcode },
   },
@@ -11050,6 +11052,14 @@ static const struct dis386 mod_table[][2] = {
     { RM_TABLE (RM_C7_REG_7) },
   },
   {
+    /* MOD_FF_REG_3 */
+    { "Jcall{T|}", { indirEp } },
+  },
+  {
+    /* MOD_FF_REG_5 */
+    { "Jjmp{T|}", { indirEp } },
+  },
+  {
     /* MOD_0F01_REG_0 */
     { X86_64_TABLE (X86_64_0F01_REG_0) },
     { RM_TABLE (RM_0F01_REG_0) },