diff --git a/gettext-csharp.spec b/gettext-csharp.spec
index 7379780..5c5fcce 100644
--- a/gettext-csharp.spec
+++ b/gettext-csharp.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gettext-csharp (Version 0.18.1.1)
+# spec file for package gettext-csharp
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,7 +26,7 @@ License:        LGPLv2.1+
 Group:          Development/Tools/Other
 AutoReqProv:    on
 Version:        0.18.1.1
-Release:        1
+Release:        2
 Summary:        Native Language Support (NLS) for C#
 PreReq:         %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff --git a/gettext-java.spec b/gettext-java.spec
index 9033d85..f024016 100644
--- a/gettext-java.spec
+++ b/gettext-java.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gettext-java (Version 0.18.1.1)
+# spec file for package gettext-java
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@ License:        LGPLv2.1+
 Group:          Development/Tools/Other
 AutoReqProv:    on
 Version:        0.18.1.1
-Release:        1
+Release:        2
 Summary:        Java Support for Native Language Support (NLS)
 PreReq:         %{install_info_prereq}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
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 3b17412..799e2c4 100644
--- a/gettext-runtime.spec
+++ b/gettext-runtime.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package gettext-runtime (Version 0.18.1.1)
+# spec file for package gettext-runtime
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@
 
 Name:           gettext-runtime
 Version:        0.18.1.1
-Release:        1
+Release:        2
 BuildRequires:  gcc-c++ perl-libintl-perl tcl
 # To get an updated linkdupes.sh (in case there are new dupes), temproarily enable:
 #BuildRequires: fdupes
@@ -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}