diff --git a/pcre.changes b/pcre.changes
index 04fdb35..13ef4de 100644
--- a/pcre.changes
+++ b/pcre.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Sep 12 13:10:30 UTC 2017 - matz@suse.com
+
+- RunTest needs much stack, on s390x more than the default
+  8 MB.  [bnc#1046102]
+
 -------------------------------------------------------------------
 Tue Jul 25 08:15:58 UTC 2017 - astieger@suse.com
 
diff --git a/pcre.spec b/pcre.spec
index e7c35a6..45126ff 100644
--- a/pcre.spec
+++ b/pcre.spec
@@ -157,6 +157,9 @@ autoreconf -fiv
   --enable-utf8 \
   --enable-unicode-properties
 %if %{do_profiling}
+  # RunTest test 2 needs lots of stack, if it ever segfaults
+  # try increasing this
+  ulimit -s $((16*1024))
   make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" V=1
   make %{?_smp_mflags} CFLAGS="%{optflags} %{cflags_profile_generate}" check
   make %{?_smp_mflags} clean
@@ -173,6 +176,9 @@ mv %{buildroot}%{_datadir}/doc/pcre %{buildroot}/%{_defaultdocdir}/pcre-doc
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
+# RunTest test 2 needs lots of stack, if it ever segfaults
+# try increasing this
+ulimit -s $((16*1024))
 make %{?_smp_mflags} check
 
 %post -n libpcre1 -p /sbin/ldconfig