diff --git a/xen.spec b/xen.spec
index 8a3601c..8b02b84 100644
--- a/xen.spec
+++ b/xen.spec
@@ -861,8 +861,8 @@ rm -f  $RPM_BUILD_ROOT/%{_bindir}/qemu-nbd-xen
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/debug
 rm -rf $RPM_BUILD_ROOT/usr/lib/debug
 # Upstream Qemu
-rm -rf  $RPM_BUILD_ROOT/usr/local/share/qemu
-rm -rf  $RPM_BUILD_ROOT/usr/local/share/doc/qemu
+rm -rf $RPM_BUILD_ROOT/usr/local/share/qemu
+rm -rf $RPM_BUILD_ROOT/usr/local/share/doc/qemu
 rm -f  $RPM_BUILD_ROOT/usr/local/etc/qemu/target-x86_64.conf
 rm -f  $RPM_BUILD_ROOT/usr/local/share/man/man1/qemu.1
 rm -f  $RPM_BUILD_ROOT/usr/local/share/man/man1/qemu-img.1
@@ -899,14 +899,17 @@ rm -rf $RPM_BUILD_ROOT/etc/qemu
 rm -rf $RPM_BUILD_ROOT/etc/xen
 rm -rf $RPM_BUILD_ROOT/usr/local/etc
 rm -rf $RPM_BUILD_ROOT/var
-rm -f $RPM_BUILD_ROOT/%{_bindir}/*store*
-rm -f $RPM_BUILD_ROOT/%{_bindir}/*trace*
-rm -f $RPM_BUILD_ROOT/%{_bindir}/xenalyze*
-rm -f $RPM_BUILD_ROOT/%{_bindir}/qemu*
-rm -f $RPM_BUILD_ROOT/%{_bindir}/pygrub
-rm -f $RPM_BUILD_ROOT/%{_bindir}/remus
-rm -f $RPM_BUILD_ROOT/%{_bindir}/tapdisk-ioemu
-rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/*store*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/*trace*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/xenalyze*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/qemu*
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/pygrub
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/remus
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/tapdisk-ioemu
+rm -f  $RPM_BUILD_ROOT/%{_bindir}/xencons
+rm -f  $RPM_BUILD_ROOT/usr/etc/qemu/target-x86_64.conf
+rm -f  $RPM_BUILD_ROOT/usr/local/etc/qemu/target-x86_64.conf
+rm -f  $RPM_BUILD_ROOT/usr/libexec/qemu-bridge-helper
 %endif
 
 %if %{?with_dom0_support}0
@@ -1033,7 +1036,6 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 %{_libdir}/python%{pyver}/site-packages/xen/xsview/*
 %{_libdir}/python%{pyver}/site-packages/fsimage.so
 %{_libdir}/python%{pyver}/site-packages/xnloader.py
-%endif
 
 %files xend-tools
 %defattr(-,root,root)
@@ -1062,6 +1064,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 %{_libdir}/python%{pyver}/site-packages/xen/xm/*
 %{_libdir}/python%{pyver}/site-packages/xen/web/*
 %config %{_fwdefdir}/xend-relocation-server
+%endif
 
 %files tools-domU
 %defattr(-,root,root)