diff --git a/SRPMS/b43-firmware/b43-firmware.spec.in b/SRPMS/b43-firmware/b43-firmware.spec.in
index bd81a1d..2346a24 100644
--- a/SRPMS/b43-firmware/b43-firmware.spec.in
+++ b/SRPMS/b43-firmware/b43-firmware.spec.in
@@ -64,6 +64,8 @@ rm -fr ${tmpdir}
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %files
 %defattr(-,root,root)
diff --git a/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in b/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
index f0586a4..21818ee 100644
--- a/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
+++ b/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
@@ -52,6 +52,8 @@ rm -fr ${tmpdir}
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %files
 %defattr(-,root,root)
diff --git a/SRPMS/flashplugin/flashplugin.spec.in b/SRPMS/flashplugin/flashplugin.spec.in
index bf1da47..82c4638 100644
--- a/SRPMS/flashplugin/flashplugin.spec.in
+++ b/SRPMS/flashplugin/flashplugin.spec.in
@@ -59,6 +59,8 @@ rm -fr ${tmpdir}
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %files
 %defattr(-,root,root)
diff --git a/SRPMS/msttcorefonts/msttcorefonts.spec.in b/SRPMS/msttcorefonts/msttcorefonts.spec.in
index 93a059c..da1ce15 100644
--- a/SRPMS/msttcorefonts/msttcorefonts.spec.in
+++ b/SRPMS/msttcorefonts/msttcorefonts.spec.in
@@ -33,6 +33,8 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 The TrueType core fonts for the web that was once available from http://www.microsoft.com/typography/fontpack/. The src rpm is cleverly constructed so that the actual fonts are downloaded from Sourceforge's site at build time. Therefore this package technically does not 'redistribute' the fonts, it just makes it easy to install them on a linux system.
 
 %prep
+%setup -c -n %{name}-%{version} -D -T
+
 rm -rf %{name}
 mkdir %{name}
 cd %{name}
@@ -83,6 +85,8 @@ cp *.ttf %{buildroot}%{fontdir}
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %post
 /usr/bin/fc-cache
diff --git a/SRPMS/skype/skype.spec.in b/SRPMS/skype/skype.spec.in
index bb5f82f..9e899d5 100644
--- a/SRPMS/skype/skype.spec.in
+++ b/SRPMS/skype/skype.spec.in
@@ -99,6 +99,8 @@ _EOF
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %files
 %defattr(-,root,root)
diff --git a/SRPMS/spotify/spotify.spec.in b/SRPMS/spotify/spotify.spec.in
index 383c7c6..6040f94 100644
--- a/SRPMS/spotify/spotify.spec.in
+++ b/SRPMS/spotify/spotify.spec.in
@@ -50,6 +50,8 @@ ln -sf /usr/lib64/libssl.so.1.0.0 %{buildroot}/opt/spotify/lib/spotify-client/li
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+rm -rf %{_builddir}/%{name}-*
+:
 
 %pre
 if [ $1 -ge 1 ]; then
diff --git a/SRPMS/sun-java7/sun-java7.spec.in b/SRPMS/sun-java7/sun-java7.spec.in
index 54e1e7f..930e2a3 100644
--- a/SRPMS/sun-java7/sun-java7.spec.in
+++ b/SRPMS/sun-java7/sun-java7.spec.in
@@ -308,6 +308,8 @@ rm -f %{buildroot}%{_jvmdir}/%{jredir}/lib/*/fxavcodecplugin-52.so
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %pre
 if [ $1 -ge 1 ]; then
diff --git a/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in b/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in
index 8725ede..512d91b 100644
--- a/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in
+++ b/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in
@@ -45,6 +45,8 @@ cp %{S:0} LICENSE
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %post
 #VBoxManage extpack uninstall Oracle_VM_VirtualBox_Extension_Pack || true
diff --git a/SRPMS/win32codecs/win32codecs.spec.in b/SRPMS/win32codecs/win32codecs.spec.in
index b9aea55..353fea2 100644
--- a/SRPMS/win32codecs/win32codecs.spec.in
+++ b/SRPMS/win32codecs/win32codecs.spec.in
@@ -92,6 +92,8 @@ find . -type f -exec install -D "{}" "%{buildroot}%{win32dir}/{}" \;
 
 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:
 
 %files
 %defattr(-,root,root)