diff --git a/redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch b/redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
new file mode 100644
index 0000000..a114c91
--- /dev/null
+++ b/redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
@@ -0,0 +1,21 @@
+diff -up redhat-rpm-config-9.0.3/macros.BAD redhat-rpm-config-9.0.3/macros
+--- redhat-rpm-config-9.0.3/macros.BAD	2009-07-21 13:22:43.427201497 -0400
++++ redhat-rpm-config-9.0.3/macros	2009-07-21 13:23:57.692440712 -0400
+@@ -73,6 +73,17 @@
+ #==============================================================================
+ # ---- Build policy macros.
+ #
++#
++#---------------------------------------------------------------------
++#	Expanded at beginning of %install scriptlet.
++#
++
++%__spec_install_pre %{___build_pre}\
++    [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
++    mkdir -p `dirname "$RPM_BUILD_ROOT"`\
++    mkdir "$RPM_BUILD_ROOT"\
++%{nil}
++
+ #---------------------------------------------------------------------
+ #	Expanded at end of %install scriptlet.
+ #
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 6ff7e6a..ce59bb7 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files.
 Name: redhat-rpm-config
 Version: 9.0.3
-Release: 10%{?dist}
+Release: 11%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -11,6 +11,7 @@ Patch1: limit-smp-16-threads.patch
 Patch2: redhat-rpm-config-9.0.3-F-11-Architectures.patch
 Patch3: redhat-rpm-config-9.0.3-F-11-StrongerHashes.patch
 Patch4: redhat-rpm-config-9.0.3-F-12-Architectures.patch
+Patch5: redhat-rpm-config-9.0.3-always_delete_buildroot_at_install.patch
 BuildArch: noarch
 Requires: mktemp
 BuildRoot: %{_tmppath}/%{name}-root
@@ -25,6 +26,7 @@ Red Hat specific rpm configuration files.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %install
 make DESTDIR=${RPM_BUILD_ROOT} install
@@ -37,6 +39,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_prefix}/lib/rpm/redhat
 
 %changelog
+* Tue Jul 21 2009 Tom "spot" Callaway <tcallawa@redhat.com> - 9.0.3-10
+- always delete %%buildroot as first step of %%install (as long as %buildroot is not /)
+
 * Fri Jul 17 2009 Bill Nottingham <notting@redhat.com> 9.0.3-10
 - apply fedora 12 default buildflags