diff --git a/xorg-server-1.15.2-libunwind-arm.patch b/xorg-server-1.15.2-libunwind-arm.patch
new file mode 100644
index 0000000..8a28fab
--- /dev/null
+++ b/xorg-server-1.15.2-libunwind-arm.patch
@@ -0,0 +1,12 @@
+diff -Nru xorg-server-1.15.2.orig/configure.ac xorg-server-1.15.2/configure.ac
+--- xorg-server-1.15.2.orig/configure.ac	2014-06-27 02:57:42.000000000 +0200
++++ xorg-server-1.15.2/configure.ac	2014-09-10 02:08:41.158460451 +0200
+@@ -1653,7 +1653,7 @@
+ PKG_CHECK_MODULES([XSERVERCFLAGS], [$REQUIRED_MODULES $REQUIRED_LIBS])
+ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
+ 
+-PKG_CHECK_MODULES(LIBUNWIND, libunwind, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
++PKG_CHECK_MODULES(LIBUNWIND, libunwind-generic, [HAVE_LIBUNWIND=yes], [HAVE_LIBUNWIND=no])
+ if test "x$LIBUNWIND" = "xauto"; then
+     LIBUNWIND="$HAVE_LIBUNWIND"
+ fi
diff --git a/xorg-server.spec b/xorg-server.spec
index 2c4780f..92e1253 100644
--- a/xorg-server.spec
+++ b/xorg-server.spec
@@ -1,6 +1,6 @@
 Name:          xorg-server
 Version:       1.15.2
-Release:       3mamba
+Release:       4mamba
 Summary:       The core of the X.Org Foundation implementation of the X Window system
 Group:         System/X11
 Vendor:        openmamba
@@ -13,6 +13,7 @@ Source11:      xorg-server-xprofile
 Patch0:        xorg-server-1.15.2-Xorg_configure.patch
 Patch1:        xorg-server-1.3.0.0-hsync_higher_default.patch
 Patch2:        %{name}-1.6.4-fix_DGA_removal.patch
+Patch3:        xorg-server-1.15.2-libunwind-arm.patch
 License:       MIT
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 ## AUTOBUILDREQ-BEGIN
@@ -119,8 +120,14 @@ X.Org glx extension.
 %patch0 -p1
 #%patch1 -p1
 #%patch2 -p1
+%ifarch arm
+%patch3 -p1
+%endif
 
 %build
+%ifarch arm
+autoreconf -i || true
+%endif
 %configure \
   --enable-glx \
   --enable-dri \
@@ -300,6 +307,9 @@ exit 0
 %{_libdir}/xorg/modules/extensions/libglx_dri_so
 
 %changelog
+* Wed Sep 10 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-4mamba
+- arm: patch to fi libunwind build and hopefully crash at X startup
+
 * Thu Aug 21 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.15.2-3mamba
 - really apply previous patch