diff --git a/gettext-runtime.changes b/gettext-runtime.changes
index 42cb4ed..f359a8b 100644
--- a/gettext-runtime.changes
+++ b/gettext-runtime.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Oct  1 02:00:30 UTC 2011 - crrodriguez@opensuse.org
+
+- Test suite hangs in qemu-arm due to bugs in the emulator
+  workaround this issue.
+
 -------------------------------------------------------------------
 Fri Jan  7 10:36:22 CET 2011 - meissner@suse.de
 
diff --git a/gettext-runtime.spec b/gettext-runtime.spec
index e83654d..799e2c4 100644
--- a/gettext-runtime.spec
+++ b/gettext-runtime.spec
@@ -154,16 +154,19 @@ echo ".so man3/dgettext.3" > dcgettext.3
 %check
 # 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}