diff --git a/fix-build-in-qemu.patch b/fix-build-in-qemu.patch
deleted file mode 100644
index 3d0b9e6..0000000
--- a/fix-build-in-qemu.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- libsigsegv-2.10/tests/Makefile.am |    2 +-
- libsigsegv-2.10/tests/Makefile.in |    1 -
- 2 files changed, 1 insertion(+), 2 deletions(-)
-
---- a/libsigsegv-2.10/tests/Makefile.am
-+++ b/libsigsegv-2.10/tests/Makefile.am
-@@ -20,7 +20,7 @@
- 
- AUTOMAKE_OPTIONS = 1.11 gnits no-dependencies color-tests
- 
--TESTS = sigsegv1 sigsegv2 sigsegv3 stackoverflow1 stackoverflow2
-+TESTS = sigsegv1 sigsegv2 sigsegv3
- 
- EXTRA_DIST = mmaputil.h altstack.h
- 
---- a/libsigsegv-2.10/tests/Makefile.in
-+++ b/libsigsegv-2.10/tests/Makefile.in
-@@ -35,7 +35,6 @@ POST_UNINSTALL = :
- build_triplet = @build@
- host_triplet = @host@
- TESTS = sigsegv1$(EXEEXT) sigsegv2$(EXEEXT) sigsegv3$(EXEEXT) \
--	stackoverflow1$(EXEEXT) stackoverflow2$(EXEEXT) \
- 	$(am__EXEEXT_1) $(am__EXEEXT_2)
- noinst_PROGRAMS = sigsegv1$(EXEEXT) sigsegv2$(EXEEXT) \
- 	sigsegv3$(EXEEXT) stackoverflow1$(EXEEXT) \
diff --git a/libsigsegv.changes b/libsigsegv.changes
index 3a6103f..c53c820 100644
--- a/libsigsegv.changes
+++ b/libsigsegv.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jul  3 12:36:56 UTC 2013 - schwab@suse.de
+
+- fix-build-in-qemu.patch: Remove, set XFAIL_TESTS instead
+- Reenable testsuite on armv7
+
 -------------------------------------------------------------------
 Wed May  8 13:09:02 UTC 2013 - werner@suse.de
 
diff --git a/libsigsegv.spec b/libsigsegv.spec
index 4d2f065..5f343cc 100644
--- a/libsigsegv.spec
+++ b/libsigsegv.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package sigsegv
+# spec file for package libsigsegv
 #
 # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -13,27 +13,27 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-Name:               libsigsegv
+
+Name:           libsigsegv
 %define somajor	    2
 %define lname	    libsigsegv%somajor
-BuildRequires:      autoconf
-BuildRequires:      automake
-BuildRequires:      gcc
-BuildRequires:      glibc-devel
-BuildRequires:      libtool
-BuildRequires:      make
-BuildRequires:      pkgconfig
-Version:            2.10
-Release:            0
-Summary:            Library for Handling Page Faults in User Mode
-URL:                http://libsigsegv.sourceforge.net/
-Source:             ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE -- make it build in qemu
-Patch0:             fix-build-in-qemu.patch
-Group:              System/Libraries
-License:            GPL-2.0+
-BuildRoot:          %{_tmppath}/build-%{name}-%{version}
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc
+BuildRequires:  glibc-devel
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  pkgconfig
+Version:        2.10
+Release:        0
+Summary:        Library for Handling Page Faults in User Mode
+License:        GPL-2.0+
+Group:          System/Libraries
+Url:            http://libsigsegv.sourceforge.net/
+Source:         ftp://ftp.gnu.org/pub/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 This is a library for handling page faults in user mode. A page fault occurs
@@ -41,8 +41,8 @@ when a program tries to access to a region of memory that is currently not
 available.
 
 %package -n %lname
-Summary:            Library for Handling Page Faults in User Mode
-Group:              System/Libraries
+Summary:        Library for Handling Page Faults in User Mode
+Group:          System/Libraries
 
 %description -n %lname
 This is a library for handling page faults in user mode. A page fault occurs
@@ -50,9 +50,9 @@ when a program tries to access to a region of memory that is currently not
 available.
 
 %package devel
-Summary:            Library for Handling Page Faults in User Mode
-Group:              Development/Libraries/C and C++
-Requires:           %lname = %{version}-%{release}
+Summary:        Library for Handling Page Faults in User Mode
+Group:          Development/Libraries/C and C++
+Requires:       %lname = %{version}-%{release}
 
 %description devel
 This is a library for handling page faults in user mode. A page fault occurs
@@ -60,9 +60,8 @@ when a program tries to access to a region of memory that is currently not
 available.
 
 %package doc
-Summary:            Library for Handling Page Faults in User Mode
-Group:              Development/Libraries/C and C++
-Group:              Documentation/Other
+Summary:        Library for Handling Page Faults in User Mode
+Group:          Documentation/Other
 
 %description doc
 This is a library for handling page faults in user mode. A page fault occurs
@@ -71,10 +70,6 @@ available.
 
 %prep
 %setup -q
-%if 0%{?qemu_user_space_build:1}
-# qemu does not support stack overflows well ;)
-%patch0 -p1 -b .qemu
-%endif
 
 %build
 %configure \
@@ -87,9 +82,11 @@ make %{?_smp_mflags}
 %__rm "%{buildroot}%{_libdir}/libsigsegv.la"
 
 %check
-%ifnarch armv7l armv7hl
-%__make check
+%if 0%{?qemu_user_space_build:1}
+# qemu does not support stack overflows well ;)
+export XFAIL_TESTS="stackoverflow1 stackoverflow2"
 %endif
+%__make check
 
 %post   -n %lname -p /sbin/ldconfig
 %postun -n %lname -p /sbin/ldconfig
@@ -108,3 +105,5 @@ make %{?_smp_mflags}
 %{_includedir}/sigsegv.h
 %{_libdir}/libsigsegv.so
 %{_libdir}/libsigsegv.a
+
+%changelog