diff --git a/anaconda/anaconda.spec b/anaconda/anaconda.spec
index 6f1f843..e54e954 100644
--- a/anaconda/anaconda.spec
+++ b/anaconda/anaconda.spec
@@ -15,6 +15,10 @@ URL:     http://fedoraproject.org/wiki/Anaconda
 # make dist
 Source0: %{name}-%{version}.tar.bz2
 
+%if 0%{?qubes_builder}
+%define _builddir %(pwd)/anaconda
+%endif
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Versions of required components (done so we make sure the buildrequires
@@ -217,7 +221,10 @@ options. This includes driver disks, kickstarts, and finding the anaconda
 runtime on NFS/HTTP/FTP servers or local disks.
 
 %prep
+%if ! 0%{?qubes_builder}
 %setup -q
+%endif
+
 
 %build
 %configure --disable-static \
diff --git a/firstboot/firstboot.spec b/firstboot/firstboot.spec
index bbf924b..24f0cc7 100644
--- a/firstboot/firstboot.spec
+++ b/firstboot/firstboot.spec
@@ -1,5 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
+%if 0%{?qubes_builder}
+%define _builddir %(pwd)/firstboot
+%endif
+
 Summary: Initial system configuration utility
 Name: firstboot
 URL: http://fedoraproject.org/wiki/FirstBoot
@@ -40,7 +44,9 @@ The firstboot utility runs after installation.  It guides the user through
 a series of steps that allows for easier configuration of the machine.
 
 %prep
+%if ! 0%{?qubes_builder}
 %setup -q
+%endif
 
 %build
 
diff --git a/lorax-templates-qubes/lorax-templates-qubes.spec b/lorax-templates-qubes/lorax-templates-qubes.spec
index 6dc17d9..82b7d41 100644
--- a/lorax-templates-qubes/lorax-templates-qubes.spec
+++ b/lorax-templates-qubes/lorax-templates-qubes.spec
@@ -1,3 +1,7 @@
+%if 0%{?qubes_builder}
+%define _builddir %(pwd)/lorax-templates-qubes
+%endif
+
 Name:		lorax-templates-qubes
 Version:	1.1
 Release:	1%{?dist}
@@ -16,8 +20,9 @@ BuildArch:      noarch
 Lorax templates for Qubes installation ISO.
 
 %prep
+%if ! 0%{?qubes_builder}
 %setup -q
-
+%endif
 
 %build
 
diff --git a/pungi/pungi.spec b/pungi/pungi.spec
index 64e5343..d41cb3b 100644
--- a/pungi/pungi.spec
+++ b/pungi/pungi.spec
@@ -1,5 +1,9 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%if 0%{?qubes_builder}
+%define _sourcedir %(pwd)/pungi
+%endif
+
 Name:           pungi
 Version:        2.13
 Release:        1.2%{?dist}
diff --git a/pykickstart/pykickstart.spec b/pykickstart/pykickstart.spec
index b9a2ec0..3683602 100644
--- a/pykickstart/pykickstart.spec
+++ b/pykickstart/pykickstart.spec
@@ -1,5 +1,9 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
+%if 0%{?qubes_builder}
+%define _sourcedir %(pwd)/pykickstart
+%endif
+
 Summary:  A python library for manipulating kickstart files
 Name: pykickstart
 Url: http://fedoraproject.org/wiki/pykickstart
diff --git a/qubes-logos/qubes-logos.spec b/qubes-logos/qubes-logos.spec
index 1a93b74..5287471 100644
--- a/qubes-logos/qubes-logos.spec
+++ b/qubes-logos/qubes-logos.spec
@@ -1,3 +1,7 @@
+%if 0%{?qubes_builder}
+%define _builddir %(pwd)/qubes-logos
+%endif
+
 Name: qubes-logos
 Summary: Icons and pictures
 Version: 1
@@ -30,7 +34,9 @@ The qubes-logos package contains various image files which can be
 used by the bootloader, anaconda, and other related tools.
 
 %prep
+%if ! 0%{?qubes_builder}
 %setup -q
+%endif
 
 %build
 
diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index 130e700..2bac496 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -2,6 +2,10 @@
 %define release_name R%{dist_version}
 %define fedora_base_version 18
 
+%if 0%{?qubes_builder}
+%define _builddir %(pwd)/qubes-release
+%endif
+
 Summary:	Qubes release files
 Name:		qubes-release
 Version:	%{dist_version}
@@ -34,7 +38,9 @@ Qubes release notes package.
 
 
 %prep
+%if ! 0%{?qubes_builder}
 %setup -q
+%endif
 
 %build
 
@@ -71,7 +77,11 @@ for file in {qubes,fedora,fedora-updates}*repo ; do
 done
 
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/qubes
+%if 0%{?qubes_builder}
+install -m 644 ../conf/comps-qubes.xml $RPM_BUILD_ROOT/usr/share/qubes/Qubes-comps.xml
+%else
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/usr/share/qubes/Qubes-comps.xml
+%endif
 
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm