diff --git a/pdns-fixarm32.patch b/pdns-fixarm32.patch
new file mode 100644
index 0000000..05e0fb3
--- /dev/null
+++ b/pdns-fixarm32.patch
@@ -0,0 +1,32 @@
+--- pdns-3.2/pdns/aes/aeskey.c.orig	2013-01-17 10:16:52.000000000 +0100
++++ pdns-3.2/pdns/aes/aeskey.c	2013-04-18 14:57:44.000000000 +0200
+@@ -488,6 +488,7 @@ AES_RETURN aes_decrypt_key192(const unsi
+     ss[3] ^= ss[2]; k[v(56,(8*(i))+11)] = ss[3]; \
+ }
+ 
++#if 0
+ AES_RETURN aes_decrypt_key256(const unsigned char *key, aes_decrypt_ctx cx[1])
+ {   uint_32t    ss[9];
+ #if defined( d_vars )
+@@ -536,11 +537,13 @@ AES_RETURN aes_decrypt_key256(const unsi
+ #endif
+     return EXIT_SUCCESS;
+ }
++#endif
+ 
+ #endif
+ 
+ #if defined( AES_VAR )
+ 
++#if 0
+ AES_RETURN aes_decrypt_key(const unsigned char *key, int key_len, aes_decrypt_ctx cx[1])
+ {
+     switch(key_len)
+@@ -551,6 +554,7 @@ AES_RETURN aes_decrypt_key(const unsigne
+     default: return EXIT_FAILURE;
+     }
+ }
++#endif
+ 
+ #endif
+ 
diff --git a/pdns.spec b/pdns.spec
index a9b4f17..ddea9aa 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -3,7 +3,7 @@
 
 Name: pdns
 Version: 3.2
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A modern, advanced and high performance authoritative-only nameserver
 Group: System Environment/Daemons
 License: GPLv2
@@ -11,6 +11,7 @@ URL: http://powerdns.com
 Source0: http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
 Source1: pdns.service
 Patch0: pdns-default-config.patch
+Patch1: pdns-fixarm32.patch
 
 Requires(pre): shadow-utils
 Requires(post): systemd-sysv
@@ -96,6 +97,7 @@ This package contains the SQLite backend for %{name}
 %prep
 %setup -q
 %patch0 -p1 -b .default-config-patch
+%patch1 -p1 -b .pdns-fixarm32
 
 %build
 autoreconf -v -f -i
@@ -203,6 +205,9 @@ exit 0
 %doc pdns/bind-dnssec.schema.sqlite3.sql
 
 %changelog
+* Mon Apr 22 2013 Morten Stevens <mstevens@imt-systems.com> - 3.2-7
+- Disarm dead code that causes gcc crashes on ARM (rhbz#954191)
+
 * Tue Apr 09 2013 Morten Stevens <mstevens@imt-systems.com> - 3.2-6
 - Add support for aarch64 (rhbz#926316)