diff --git a/pypy3.spec b/pypy3.spec
index b6e6d0b..16d5f46 100644
--- a/pypy3.spec
+++ b/pypy3.spec
@@ -1,6 +1,6 @@
 Name:           pypy3
 Version:        5.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python 3 implementation with a Just-In-Time compiler
 
 # LGPL and another free license we'd need to ask spot about are present in some
@@ -11,7 +11,7 @@ License:        MIT and Python and UCD
 URL:            http://pypy.org/
 
 # Not available yet
-ExcludeArch: aarch64 armv7hl s390 s390x
+ExcludeArch: aarch64
 
 # High-level configuration of the build:
 
@@ -311,7 +311,10 @@ find lib-python/%{pylibver} -name "*.py" -exec \
     "{}" \
     \;
 
+sed -i -r 's/\$\(LDFLAGSEXTRA\)/& -fuse-ld=gold/' ./rpython/translator/platform/posix.py
+
 %build
+# Top memory usage is about 4.5GB on arm7hf
 free
 
 BuildPyPy() {
@@ -829,6 +832,9 @@ CheckPyPy pypy3-stackless
 
 
 %changelog
+* Sat Nov 12 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.5.0-2
+- Also build on arm and s390*
+
 * Sat Oct 15 2016 Miro Hrončok <mhroncok@redhat.com> - 5.5.0-1
 - PyPy 3.3 5.5.0
 - On Fedora 26+, BR compat-openssl10-devel