diff --git a/lib/Target/SystemZ/SystemZInstrInfo.td b/lib/Target/SystemZ/SystemZInstrInfo.td
index c124af65da5..30204fa23c1 100644
--- a/lib/Target/SystemZ/SystemZInstrInfo.td
+++ b/lib/Target/SystemZ/SystemZInstrInfo.td
@@ -432,6 +432,24 @@ def MOV128r0_even : Pseudo<(outs GR128:$dst), (ins GR128:$src),
                            []>;
 }
 
+// Byte swaps
+def BSWAP32rr : Pseudo<(outs GR32:$dst), (ins GR32:$src),
+                       "lrvr\t{$dst, $src}",
+                       [(set GR32:$dst, (bswap GR32:$src))]>;
+def BSWAP64rr : Pseudo<(outs GR64:$dst), (ins GR64:$src),
+                       "lrvgr\t{$dst, $src}",
+                       [(set GR64:$dst, (bswap GR64:$src))]>;
+
+def BSWAP16rm : Pseudo<(outs GR32:$dst), (ins rriaddr:$src),
+                       "lrvh\t{$dst, $src}",
+                       [(set GR32:$dst, (bswap (extloadi32i16 rriaddr:$src)))]>;
+def BSWAP32rm : Pseudo<(outs GR32:$dst), (ins rriaddr:$src),
+                       "lrv\t{$dst, $src}",
+                       [(set GR32:$dst, (bswap (load rriaddr:$src)))]>;
+def BSWAP64rm : Pseudo<(outs GR64:$dst), (ins rriaddr:$src),
+                       "lrvg\t{$dst, $src}",
+                       [(set GR64:$dst, (bswap (load rriaddr:$src)))]>;
+
 //===----------------------------------------------------------------------===//
 // Arithmetic Instructions
 
diff --git a/test/CodeGen/SystemZ/11-BSwap.ll b/test/CodeGen/SystemZ/11-BSwap.ll
new file mode 100644
index 00000000000..d04fa42bc18
--- /dev/null
+++ b/test/CodeGen/SystemZ/11-BSwap.ll
@@ -0,0 +1,48 @@
+; RUN: llvm-as < %s | llc | grep lrvr  | count 2
+; RUN: llvm-as < %s | llc | grep lrvgr | count 1
+; RUN: llvm-as < %s | llc | grep lrvh  | count 1
+; RUN: llvm-as < %s | llc | grep {lrv.%} | count 1
+; RUN: llvm-as < %s | llc | grep {lrvg.%} | count 1
+
+
+target datalayout = "E-p:64:64:64-i8:8:16-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f128:128:128-a0:16:16"
+target triple = "s390x-linux"
+
+
+define i16 @foo(i16 zeroext %a) zeroext {
+	%res = tail call i16 @llvm.bswap.i16(i16 %a)
+	ret i16 %res
+}
+
+define i32 @foo2(i32 zeroext %a) zeroext {
+        %res = tail call i32 @llvm.bswap.i32(i32 %a)
+        ret i32 %res
+}
+
+define i64 @foo3(i64 %a) zeroext {
+        %res = tail call i64 @llvm.bswap.i64(i64 %a)
+        ret i64 %res
+}
+
+define i16 @foo4(i16* %b) zeroext {
+	%a = load i16* %b
+        %res = tail call i16 @llvm.bswap.i16(i16 %a)
+        ret i16 %res
+}
+
+define i32 @foo5(i32* %b) zeroext {
+	%a = load i32* %b
+        %res = tail call i32 @llvm.bswap.i32(i32 %a)
+        ret i32 %res
+}
+
+define i64 @foo6(i64* %b) {
+	%a = load i64* %b
+        %res = tail call i64 @llvm.bswap.i64(i64 %a)
+        ret i64 %res
+}
+
+declare i16 @llvm.bswap.i16(i16) nounwind readnone
+declare i32 @llvm.bswap.i32(i32) nounwind readnone
+declare i64 @llvm.bswap.i64(i64) nounwind readnone
+