diff --git a/llvm/lib/Target/SystemZ/SystemZInstrInfo.td b/llvm/lib/Target/SystemZ/SystemZInstrInfo.td
index c6169b316d09..34152fe32b3d 100644
--- a/llvm/lib/Target/SystemZ/SystemZInstrInfo.td
+++ b/llvm/lib/Target/SystemZ/SystemZInstrInfo.td
@@ -271,6 +271,9 @@ let isReturn = 1, isTerminator = 1, isBarrier = 1, hasCtrlDep = 1 in {
 }
 
 let isBranch = 1, isTerminator = 1 in {
+  let isBarrier = 1 in
+    def JMP  : Pseudo<(outs), (ins brtarget:$dst), "j\t{$dst}", [(br bb:$dst)]>;
+
   let Uses = [PSW] in {
     def JE  : Pseudo<(outs), (ins brtarget:$dst),
                      "je\t$dst",
diff --git a/llvm/test/CodeGen/SystemZ/07-BrUnCond.ll b/llvm/test/CodeGen/SystemZ/07-BrUnCond.ll
new file mode 100644
index 000000000000..8ca6ed1a2610
--- /dev/null
+++ b/llvm/test/CodeGen/SystemZ/07-BrUnCond.ll
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | llc
+
+target datalayout = "E-p:64:64:64-i1:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128"
+target triple = "s390x-linux"
+
+define void @foo() noreturn nounwind {
+entry:
+	tail call void @baz() nounwind
+	br label %l1
+
+l1:		; preds = %entry, %l1
+	tail call void @bar() nounwind
+	br label %l1
+}
+
+declare void @bar()
+
+declare void @baz()