diff -Nru rpm-4.4.9.orig//macros.in rpm-4.4.9/macros.in
--- rpm-4.4.9.orig//macros.in	2010-03-19 18:48:13.759362076 +0100
+++ rpm-4.4.9/macros.in	2010-03-19 18:58:18.256361807 +0100
@@ -1156,17 +1156,17 @@
 # ---- config.guess platform macros.
 #	Macro(s) similar to the tokens used by configure.
 #
-%_build			%{_host}
-%_build_alias		%{_host_alias}
-%_build_cpu		%{_host_cpu}
-%_build_vendor		%{_host_vendor}
-%_build_os		%{_host_os}
-%_host			@host@
+%_build			%{_build_cpu}-%{_build_vendor}-%{_build_os}
+%_build_alias		@host_alias@%{nil}
+%_build_cpu		@host_cpu@
+%_build_vendor		@host_vendor@
+%_build_os		@host_os@
+%_host			%{_host_cpu}-%{_host_vendor}-%{_host_os}
 %_host_alias		@host_alias@%{nil}
 %_host_cpu		@host_cpu@
 %_host_vendor		@host_vendor@
 %_host_os		@host_os@
-%_target		%{_host}
+%_target		%{_target_cpu}-%{_target_vendor}-%{_target_os}
 %_target_alias		%{_host_alias}
 %_target_cpu		%{_host_cpu}
 %_target_vendor		%{_host_vendor}