diff --git a/llvm-3.7.1-cmake-s390.patch b/llvm-3.7.1-cmake-s390.patch
new file mode 100644
index 0000000..bc9b583
--- /dev/null
+++ b/llvm-3.7.1-cmake-s390.patch
@@ -0,0 +1,12 @@
+diff -up llvm-3.7.1.src/cmake/config-ix.cmake.s390 llvm-3.7.1.src/cmake/config-ix.cmake
+--- llvm-3.7.1.src/cmake/config-ix.cmake.s390	2016-02-16 12:27:36.000000000 +0100
++++ llvm-3.7.1.src/cmake/config-ix.cmake	2016-02-16 12:27:52.000000000 +0100
+@@ -356,6 +356,8 @@ elseif (LLVM_NATIVE_ARCH MATCHES "msp430
+   set(LLVM_NATIVE_ARCH MSP430)
+ elseif (LLVM_NATIVE_ARCH MATCHES "hexagon")
+   set(LLVM_NATIVE_ARCH Hexagon)
++elseif (LLVM_NATIVE_ARCH MATCHES "s390")
++  set(LLVM_NATIVE_ARCH SystemZ)
+ elseif (LLVM_NATIVE_ARCH MATCHES "s390x")
+   set(LLVM_NATIVE_ARCH SystemZ)
+ elseif (LLVM_NATIVE_ARCH MATCHES "wasm32")
diff --git a/llvm.spec b/llvm.spec
index e3eebcb..cf9d3aa 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -7,7 +7,7 @@
 
 Name:		llvm
 Version:	3.7.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	The Low Level Virtual Machine
 
 License:	NCSA
@@ -16,6 +16,9 @@ Source0:	http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz
 
 Source100:	llvm-config.h
 
+# recognize s390 as SystemZ when configuring build
+Patch0:		llvm-3.7.1-cmake-s390.patch
+
 BuildRequires:	cmake
 BuildRequires:	zlib-devel
 BuildRequires:  libffi-devel
@@ -65,6 +68,7 @@ Static libraries for the LLVM compiler infrastructure.
 
 %prep
 %setup -q -n %{name}-%{version}.src
+%patch0 -p1 -b .s390
 
 %build
 mkdir -p _build
@@ -164,6 +168,9 @@ make check-all || :
 %{_libdir}/*.a
 
 %changelog
+* Tue Feb 16 2016 Dan Horák <dan[at][danny.cz> 3.7.1-7
+- recognize s390 as SystemZ when configuring build
+
 * Sat Feb 13 2016 Dave Airlie <airlied@redhat.com> 3.7.1-6
 - export C++ API for mesa.