diff -ruN rpmbuild-orig/SOURCES/nss-softokn-3.16-arm.patch rpmbuild/SOURCES/nss-softokn-3.16-arm.patch
--- rpmbuild-orig/SOURCES/nss-softokn-3.16-arm.patch	1970-01-01 01:00:00.000000000 +0100
+++ rpmbuild/SOURCES/nss-softokn-3.16-arm.patch	2015-09-03 00:10:42.593916595 +0200
@@ -0,0 +1,12 @@
+diff -ruN nss-orig/lib/freebl/lowhash_vector.c nss/lib/freebl/lowhash_vector.c
+--- nss-orig/lib/freebl/lowhash_vector.c	2015-06-25 23:44:00.547713385 +0200
++++ nss/lib/freebl/lowhash_vector.c	2015-06-25 23:45:21.202553235 +0200
+@@ -99,7 +99,7 @@
+ static PRCallOnceType loadFreeBLOnce;
+ /* remove when NSPR pratom.h is updated. s390 has atomic intrinsics,
+  * but nspr doesn't know it. */
+-#if defined(__s390__) || defined(__s390x__)
++#if defined(__s390__) || defined(__s390x__) || defined(__arm__)
+ #undef PR_ATOMIC_SET
+ #define PR_ATOMIC_SET(val, newval) __sync_lock_test_and_set(val, newval)
+ #endif
diff -ruN rpmbuild-orig/SPECS/nss-softokn.spec rpmbuild/SPECS/nss-softokn.spec
--- rpmbuild-orig/SPECS/nss-softokn.spec	2015-09-02 00:30:40.000000000 +0200
+++ rpmbuild/SPECS/nss-softokn.spec	2015-09-03 00:12:07.698765714 +0200
@@ -31,7 +31,7 @@
 Summary:          Network Security Services Softoken Module
 Name:             nss-softokn
 Version:          3.16.2.3
-Release:          13%{?dist}
+Release:          13%{?dist}.redsleeve
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -108,6 +108,7 @@
 # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1113632
 Patch204:	limit-create-fipscheck.patch
 Patch205:	nss-softokn-3.16-tls12-mechanisms-fipstest.patch
+Patch10001:	nss-softokn-3.16-arm.patch
 
 
 %description
@@ -190,6 +191,7 @@
 pushd nss
 %patch102 -p1 -b .extra_check
 popd
+%patch10001 -p0 -b .arm
 
 %build
 
@@ -355,7 +357,6 @@
   echo "okay: test suite detected no failures"
 else
 # test suite is failing on arm and has for a while let's run the test suite but make it non fatal on arm
-%ifnarch %{arm}
   if [ ${GREP_EXIT_STATUS:-0} -eq 0 ]; then
     # while a situation in which grep return status is 0 and it doesn't output
     # anything shouldn't happen, set the default to something that is
@@ -371,7 +372,6 @@
       exit 1
     fi
   fi
-%endif
 fi
 echo "test suite completed"
 
@@ -495,6 +495,10 @@
 %{_includedir}/nss3/shsign.h
 
 %changelog
+* Wed Sep 02 2015 Jacco Ligthart <jacco@redsleeve.org> - 3.16.2.3-13.redsleeve
+- added a 'dummy' echo, to make the build work.
+- added an arm patch
+
 * Fri Aug 07 2015 Elio Maldonado <emaldona@redhat.com> - 3.16.2.3-13
 - Pick up upstream freebl patch for CVE-2015-2730
 - Check for P == Q or P ==-Q before adding P and Q