diff --git a/tbb-2017-64bit.patch b/tbb-2017-64bit.patch
new file mode 100644
index 0000000..df79a5c
--- /dev/null
+++ b/tbb-2017-64bit.patch
@@ -0,0 +1,13 @@
+diff -up tbb2017_20160916oss/build/linux.inc.s390x tbb2017_20160916oss/build/linux.inc
+--- tbb2017_20160916oss/build/linux.inc.s390x	2016-10-07 13:54:30.422343446 +0200
++++ tbb2017_20160916oss/build/linux.inc	2016-10-07 13:54:53.002343446 +0200
+@@ -102,6 +102,9 @@ endif
+ ifeq ($(arch),sparc)
+         def_prefix = lin64
+ endif
++ifeq ($(arch),s390x)
++        def_prefix = lin64
++endif
+ ifeq ($(arch),armv7)
+         def_prefix = lin32
+ endif
diff --git a/tbb.spec b/tbb.spec
index 2a3414b..5f3a8d0 100644
--- a/tbb.spec
+++ b/tbb.spec
@@ -7,7 +7,7 @@
 Name:    tbb
 Summary: The Threading Building Blocks library abstracts low-level threading details
 Version: 2017
-Release: 2.%{releasedate}%{?dist}
+Release: 3.%{releasedate}%{?dist}
 License: ASL 2.0
 Group:   Development/Tools
 URL:     http://threadingbuildingblocks.org/
@@ -35,6 +35,11 @@ Patch2: tbb-4.0-mfence.patch
 # Related: https://bugzilla.redhat.com/show_bug.cgi?id=1037347
 Patch3: tbb-4.3-dont-snip-Wall.patch
 
+# Fix detection of s390x as 64-bit arch, it affects the version script used
+# for symbols in the public library
+# Related: https://bugzilla.redhat.com/show_bug.cgi?id=1379632
+Patch4: tbb-2017-64bit.patch
+
 BuildRequires: gcc-c++
 BuildRequires: python2-devel
 BuildRequires: swig
@@ -98,6 +103,7 @@ Python 3 TBB module.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 # For repeatable builds, don't query the hostname or architecture
 sed -i 's/`hostname -s`" ("`uname -m`/fedorabuild" ("%{_arch}/' \
@@ -222,6 +228,9 @@ popd
 %endif
 
 %changelog
+* Fri Oct 07 2016 Dan Horák <dan[at]danny.cz> - 2017-3.20160916
+- Fix detection of s390x as 64-bit arch (#1379632)
+
 * Fri Sep 30 2016 Jerry James <loganjerry@gmail.com> - 2017-2.20160916
 - New upstream release