diff --git a/flex.changes b/flex.changes
index 2e73dd0..10db9e3 100644
--- a/flex.changes
+++ b/flex.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Oct  3 17:09:45 CEST 2011 - dmueller@suse.de
+
+- fix compile failure outside ARM
+
+-------------------------------------------------------------------
+Fri Sep 30 11:13:00 UTC 2011 - max@suse.com
+
+- Skip the test suite when building in qemu userspace emulation
+  to fix and speedup build on ARM.
+
 -------------------------------------------------------------------
 Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
 
diff --git a/flex.spec b/flex.spec
index 249ef84..44b1699 100644
--- a/flex.spec
+++ b/flex.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package flex (Version 2.5.35)
+# spec file for package flex
 #
-# 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
@@ -15,6 +15,8 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+
 Name:           flex
 BuildRequires:  bison gcc-c++ help2man
 Url:            http://flex.sourceforge.net/
@@ -62,7 +64,9 @@ autoreconf -fi
 make %{?_smp_mflags}
 
 %check
+%if !0%{?qemu_user_space_build:1}
 make check
+%endif
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT