diff --git a/libunistring.changes b/libunistring.changes
index 0655f9d..37afdf0 100644
--- a/libunistring.changes
+++ b/libunistring.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Sep 30 20:01:26 UTC 2011 - crrodriguez@opensuse.org
+
+- Workaround qemu-arm bugs. 
+
 -------------------------------------------------------------------
 Mon Aug 30 12:04:42 CEST 2010 - pgajdos@suse.cz
 
diff --git a/libunistring.spec b/libunistring.spec
index 4014504..f0f6c38 100644
--- a/libunistring.spec
+++ b/libunistring.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libunistring (Version 0.9.3)
+# spec file for package libunistring
 #
-# 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
@@ -74,7 +74,9 @@ rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libunistring.la
 
 %check
+%if ! 0%{?qemu_user_space_build}
 make check
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT