diff --git a/tbb-2017-64bit.patch b/tbb-2017-64bit.patch
new file mode 100644
index 0000000..e37acf3
--- /dev/null
+++ b/tbb-2017-64bit.patch
@@ -0,0 +1,15 @@
+diff -up tbb2017_20161128oss/build/linux.inc.s390x tbb2017_20161128oss/build/linux.inc
+--- tbb2017_20161128oss/build/linux.inc.s390x	2016-11-29 15:24:54.000000000 +0100
++++ tbb2017_20161128oss/build/linux.inc	2017-01-02 10:28:44.000000000 +0100
+@@ -99,7 +99,10 @@ SONAME_SUFFIX =$(shell grep TBB_COMPATIB
+ ifeq ($(arch),ia64)
+         def_prefix = lin64ipf
+ endif
+-ifeq ($(arch),sparc s390x)
++ifeq ($(arch),sparc)
++        def_prefix = lin64
++endif
++ifeq ($(arch),s390x)
+         def_prefix = lin64
+ endif
+ ifeq ($(arch),armv7)
diff --git a/tbb.spec b/tbb.spec
index dd11beb..f2760e2 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: 6.%{releasedate}%{?dist}
+Release: 7.%{releasedate}%{?dist}
 License: ASL 2.0
 Group:   Development/Tools
 URL:     http://threadingbuildingblocks.org/
@@ -35,6 +35,12 @@ 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
+# Upstream report: https://github.com/01org/tbb/issues/9
+Patch4: tbb-2017-64bit.patch
+
 BuildRequires: gcc-c++
 BuildRequires: python2-devel
 BuildRequires: swig
@@ -98,6 +104,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 +229,9 @@ popd
 %endif
 
 %changelog
+* Mon Jan 02 2017 Dan Horák <dan[at]danny.cz> - 2017-7.20161128
+- Fix detection of s390x as 64-bit arch (#1379632)
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 2017-6.20161128
 - Rebuild for Python 3.6