diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes
index 8946431..4fde6b1 100644
--- a/webkit2gtk3.changes
+++ b/webkit2gtk3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 24 14:29:11 UTC 2017 - fcrozat@suse.com
+
+- Enable gold linker on s390/s390x on SLE15/Tumbleweed.
+
 -------------------------------------------------------------------
 Thu Sep 14 14:57:43 UTC 2017 - fezhang@suse.com
 
diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec
index 98202e4..4cc2d6c 100644
--- a/webkit2gtk3.spec
+++ b/webkit2gtk3.spec
@@ -25,6 +25,15 @@
 %define _jscver 4
 %define _pkgconfig_suffix gtk-3.0
 %define _name webkitgtk
+
+# gold linker not available on old s390/s390x
+%define _gold_linker 1
+%if 0%{suse_version} < 1320
+%ifarch s390 s390x
+%define _gold_linker 0
+%endif
+%endif
+
 Name:           webkit2gtk3
 Version:        2.18.0
 Release:        0
@@ -79,7 +88,7 @@ BuildRequires:  pkgconfig(libxslt) >= 1.1.7
 BuildRequires:  pkgconfig(sqlite3)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(zlib)
-%ifnarch s390 s390x
+%if %{_gold_linker}
 BuildRequires:  binutils-gold
 %endif
 BuildRequires:  gcc-c++ >= 4.9
@@ -236,11 +245,10 @@ more.
 
 %build
 # Use linker flags to reduce memory consumption
-%ifarch s390 s390x
-# binutils-gold doesn't exist on s390x
-%global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /')
-%else
+%if %{_gold_linker}
 %global optflags %(echo %{optflags} -Wl,--no-keep-memory | sed 's/-g /-g1 /')
+%else
+%global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /')
 %endif
 %cmake \
   -DCMAKE_BUILD_TYPE=Release \