diff --git a/rpm.changes b/rpm.changes
index 1a5ee96..c331645 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep 29 18:49:33 CEST 2011 - dmueller@suse.de
+
+- fix architecture definition for armv5el
+
+-------------------------------------------------------------------
+Thu Sep 29 15:16:11 UTC 2011 - adrian@suse.de
+
+- use -O0 for soft FPU ARM
+
 -------------------------------------------------------------------
 Tue Sep 27 13:34:41 UTC 2011 - adrian@suse.de
 
diff --git a/rpm.spec b/rpm.spec
index 136c31c..e97c7cb 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -195,24 +195,29 @@ rm -f m4/lt*.m4
 %build
 export CFLAGS="$RPM_OPT_FLAGS -ffunction-sections"
 export LDFLAGS="-Wl,-Bsymbolic-functions -ffunction-sections"
-%ifarch alpha
-export CFLAGS="-g -O0 -fno-strict-aliasing"
+%ifarch alpha armv5el
+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
 pushd beecrypt
-./autogen.sh --with-pic --without-python
+./autogen.sh --with-pic --without-python $BUILDTARGET
 make %{?_smp_mflags}
 popd
-%ifarch %arm armv5l armv7l armv7hl
-HOST="%{_host_cpu}-suse-linux-gnueabi" # configure.ac detects this to set %_gnu in macros
-%else
-HOST="%{_host_cpu}-suse-linux"
-%endif
+
 ./autogen.sh --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
 --libdir=%{_libdir} --sysconfdir=/etc --localstatedir=/var --with-lua \
---with-selinux --with-internal-beecrypt --with-acl --with-cap --enable-shared %{?with_python: --enable-python} \
---host="$HOST" --build="$HOST" --target="$HOST"
+--with-selinux --with-internal-beecrypt \
+--with-acl --with-cap --enable-shared %{?with_python: --enable-python} $BUILDTARGET
 
 rm po/de.gmo
 make %{?_smp_mflags}