diff --git a/clisp.changes b/clisp.changes
index de7a3be..af83790 100644
--- a/clisp.changes
+++ b/clisp.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 13 06:43:29 UTC 2012 - adrian@suse.de
+
+- disable stackoverflow tests in qemu builds (fixes arm)
+
 -------------------------------------------------------------------
 Wed Apr 18 16:04:38 UTC 2012 - dvaleev@suse.com
 
diff --git a/clisp.spec b/clisp.spec
index e8d51e5..c864f8c 100644
--- a/clisp.spec
+++ b/clisp.spec
@@ -61,6 +61,7 @@ Patch4:         clisp-2.44.1-ia64.dif
 Patch7:         clisp-2.39-ia64-wooh.dif
 Patch8:         clisp-2.39-clx.dif
 Patch10:        ffcall-1.10+2.43.dif
+Patch11:        fix-build-in-qemu.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global vimdir  %{_datadir}/vim/site/after/syntax
 %global	xarch	ppc64 s390x armv4l
@@ -102,6 +103,10 @@ contains two nice applications.
 %patch8  -p0 -b .clx
 %patch10 -p0 -b .ffcall
 %patch0
+%if 0%{?qemu_user_space_build:1}
+# qemu does not support stack overflows well ;)
+%patch11 -p0 -b .qemu
+%endif
 
 %build
 #
diff --git a/fix-build-in-qemu.patch b/fix-build-in-qemu.patch
new file mode 100644
index 0000000..47b95d2
--- /dev/null
+++ b/fix-build-in-qemu.patch
@@ -0,0 +1,25 @@
+Index: libsigsegv-2.9/tests/Makefile.am
+===================================================================
+--- libsigsegv-2.9/tests/Makefile.am.orig
++++ libsigsegv-2.9/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
+ 
+Index: libsigsegv-2.9/tests/Makefile.in
+===================================================================
+--- libsigsegv-2.9/tests/Makefile.in.orig
++++ libsigsegv-2.9/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) \