diff --git a/glibc.changes b/glibc.changes
index 1826e10..4b4b284 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,6 @@
+* Mon Jun 11 2012 Carsten Munk <carsten@merproject.org> - 2.15
+- MER#377: Do not add arm/local-linaro-cortex-strings.diff on armv6, no ARMv7/Thumb2 there
+
 * Sun May 27 2012 Carsten Munk <carsten@merproject.org> - 2.15
 - MER#295: Add back build-locale-archive and run it on postinstall
 
diff --git a/glibc.spec b/glibc.spec
index 7d6ae65..aabe253 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -190,7 +190,10 @@ If unsure if you need this, don't install this package.
 # Not well formatted locales --cvm
 sed -i "s|^localedata/locale-eo_EO.diff$||g" debian/patches/series
 sed -i "s|^localedata/locale-ia.diff$||g" debian/patches/series
-
+# This screws up armv6, as it doesn't have ARMv7 instructions/Thumb2
+%ifarch armv6l
+sed -i "s|^arm/local-linaro-cortex-strings.diff$||g" debian/patches/series
+%endif
 QUILT_PATCHES=debian/patches quilt push -a
 
 cat > find_provides.sh <<EOF