diff --git a/rpm.changes b/rpm.changes
index 2cafea1..4d3304a 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  2 09:53:02 UTC 2013 - dmueller@suse.com
+
+- extend the armv7hl hack also to armv6hl 
+
 -------------------------------------------------------------------
 Thu Jun 27 22:03:51 UTC 2013 - dmueller@suse.com
 
diff --git a/rpm.spec b/rpm.spec
index 9459f1c..aea2f6d 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -251,13 +251,11 @@ export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections"
 export CFLAGS="-g -O0 -fno-strict-aliasing -ffunction-sections"
 %endif
 
-%if %{_target_cpu}
 %ifarch %arm
 BUILDTARGET="--build=%{_target_cpu}-suse-linux-gnueabi"
 %else
 BUILDTARGET="--build=%{_target_cpu}-suse-linux"
 %endif
-%endif
 
 #cp -p /usr/share/gettext/config.rpath .
 cp autogen.sh beecrypt
@@ -355,15 +353,10 @@ rm -f %{buildroot}%{_libdir}/*.la
 rm -f %{buildroot}%{_libdir}/rpm-plugins/*.la
 sh %{buildroot}/usr/lib/rpm/find-lang.sh %{buildroot} rpm
 # On arm the kernel architecture is ignored. Not the best idea, but lets stay compatible with other distros
-%ifarch armv7hl
-# rpm is using the host_cpu as default for the platform, but armv7hl is not known by the kernel.
+%ifarch armv7hl armv6hl
+# rpm is using the host_cpu as default for the platform, but armv6/7hl is not known by the kernel.
 # so we need to enforce the platform here.
-# We don't want to use armv7l because it would make us incompatible to Fedora and MeeGo plattforms.
-echo -n armv7hl-suse-linux> %{buildroot}/etc/rpm/platform
-%endif
-%ifarch armv5tel
-# switch to armv5tel even when system cpu is armv7
-echo -n armv5tel-suse-linux> %{buildroot}/etc/rpm/platform
+echo -n "%{_target_cpu}-suse-linux-gnueabi" > %{buildroot}/etc/rpm/platform
 %endif
 
 %post