diff --git a/gettext-runtime.changes b/gettext-runtime.changes
index f359a8b..c266586 100644
--- a/gettext-runtime.changes
+++ b/gettext-runtime.changes
@@ -1,8 +1,12 @@
 -------------------------------------------------------------------
-Sat Oct  1 02:00:30 UTC 2011 - crrodriguez@opensuse.org
+Thu Sep 29 13:27:17 CEST 2011 - dmueller@suse.de
 
-- Test suite hangs in qemu-arm due to bugs in the emulator
-  workaround this issue.
+- fix build
+
+-------------------------------------------------------------------
+Thu Sep 29 10:20:07 UTC 2011 - adrian@suse.de
+
+- disable openmp when qemu is used for building (like on arm)
 
 -------------------------------------------------------------------
 Fri Jan  7 10:36:22 CET 2011 - meissner@suse.de
diff --git a/gettext-runtime.spec b/gettext-runtime.spec
index 799e2c4..b0d501a 100644
--- a/gettext-runtime.spec
+++ b/gettext-runtime.spec
@@ -114,7 +114,11 @@ autoreconf -fiv
 #sh autogen.sh
 export CFLAGS="%{optflags} -pipe -W -Wall -Dgcc_is_lint"
 export CXXFLAGS="$CFLAGS -Dgcc_is_lint"
-%configure --enable-shared
+%if 0%{?qemu_user_space_build:1}
+  OPTS="--disable-openmp"
+%endif
+%configure --enable-shared $OPTS
+
 make %{?_smp_mflags} GMSGFMT=../src/msgfmt
 # use texinfo.tex supplied by the system (texinfo)
 # make -C gettext-tools/doc gettext.pdf
@@ -155,18 +159,16 @@ echo ".so man3/dgettext.3" > dcgettext.3
 # s390s fails this test, 
 # Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion `mutex->__data.__owner == 0' failed.
 
-%if ! 0%{?qemu_user_space_build}
 make check || {
 %ifarch s390x
 	echo "got this during mbuild testing on s390x (on both times which make check ran):"
 	echo "Starting test_recursive_lock ...test-lock: pthread_mutex_lock.c:66: __pthread_mutex_lock: Assertion mutex->__data.__owner == 0 failed."
 	echo "s390x needs kernel/glibc/gcc fix, but let it continue bootstrap for now!"
-%else 
+%else
 	echo "make check failed, check it!"
 	exit 5
 %endif
 }
-%endif
 
 %clean
 rm -rf %{buildroot}