diff -u snappy-1.0.5/debian/changelog snappy-1.0.5/debian/changelog
--- snappy-1.0.5/debian/changelog
+++ snappy-1.0.5/debian/changelog
@@ -1,3 +1,11 @@
+snappy (1.0.5-2) unstable; urgency=low
+
+  * Disable unaligned accesses on ARMv4, not just ARMv5 and ARMv6.
+    Fixes unit test segfaults and subsequent FTBFS on armel.
+    (Closes: #679964) 
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Mon, 02 Jul 2012 19:30:10 +0200
+
 snappy (1.0.5-1) unstable; urgency=low
 
   * New upstream release.
only in patch2:
unchanged:
--- snappy-1.0.5.orig/snappy-stubs-internal.h
+++ snappy-1.0.5/snappy-stubs-internal.h
@@ -200,6 +200,8 @@
 // This is a mess, but there's not much we can do about it.
 
 #elif defined(__arm__) && \
+      !defined(__ARM_ARCH_4__) && \
+      !defined(__ARM_ARCH_4T__) && \
       !defined(__ARM_ARCH_5__) && \
       !defined(__ARM_ARCH_5T__) && \
       !defined(__ARM_ARCH_5TE__) && \