diff --git a/glibc.changes b/glibc.changes
index abdb862..15af4f5 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 12 11:01:41 UTC 2012 - aj@suse.de
+
+- Use _target_cpu instead of _build and _host. This makes the 
+  i686 library really build for i686.
+
 -------------------------------------------------------------------
 Tue Jan 10 12:31:14 UTC 2012 - aj@suse.de
 
diff --git a/glibc.spec b/glibc.spec
index 0ab50e7..3e5e6d7 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -451,6 +451,10 @@ fi
 uptime || :
 ulimit -a
 nice
+# We do not want configure to figure out the system its building one
+# to support a common ground and thus set build and host to the
+# target_cpu.
+%define target %{_target_cpu}-suse-linux
 # Adjust glibc version.h
 echo "#define CONFHOST \"%{_target_cpu}-suse-linux\"" >> version.h
 echo "#define CVSDATE \"`date -r ChangeLog +%Y%m%d`\"" >> version.h
@@ -540,7 +544,7 @@ configure_and_build_glibc() {
 %if %{enable_stackguard_randomization}
 		--enable-stackguard-randomization \
 %endif
-		--build=%{_build} --host=%{_host} \
+		--build=%{target} --host=%{target} \
 %ifarch ppc ppc64 %{ix86} x86_64
 		--enable-multi-arch \
 %endif