diff --git a/rpm_spec/qubes-kernel-vm-support.spec b/rpm_spec/qubes-kernel-vm-support.spec.in
similarity index 81%
rename from rpm_spec/qubes-kernel-vm-support.spec
rename to rpm_spec/qubes-kernel-vm-support.spec.in
index 1e4527f..8ccad23 100644
--- a/rpm_spec/qubes-kernel-vm-support.spec
+++ b/rpm_spec/qubes-kernel-vm-support.spec.in
@@ -19,16 +19,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 
-
-%{!?version: %define version %(cat version)}
-
-# Package contains /usr/lib, but not binary files, which confuses find-debuginfo.sh script.
-%global debug_package %{nil}
-
 Name:		qubes-kernel-vm-support
-Version:	%{version}
+Version:	@VERSION@
 Release:	1%{?dist}
 Summary:	Qubes VM kernel and initramfs modules
+Source0:    qubes-utils-%{version}.tar.gz
 
 Group:		Qubes
 Vendor:     Invisible Things Lab
@@ -38,8 +33,6 @@ URL:		http://www.qubes-os.org
 Requires:	dracut
 Requires:	dkms
 
-%define _builddir %(pwd)
-
 %description
 This package contains:
 1. Dracut module required to setup Qubes VM root filesystem. This package is
@@ -50,13 +43,7 @@ initrd is provided by dom0.
 libvchan library.
 
 %prep
-# we operate on the current directory, so no need to unpack anything
-# symlink is to generate useful debuginfo packages
-rm -f %{name}-%{version}
-ln -sf . %{name}-%{version}
-%setup -T -D
-
-%build
+%setup -q -n qubes-utils-%{version}
 
 %install
 make install-fedora-kernel-support DESTDIR=%{buildroot}
@@ -75,4 +62,4 @@ dkms add -m u2mfn -v %{version} --rpm_safe_upgrade
 dkms remove -m u2mfn -v %{version} --all --rpm_safe_upgrade
 
 %changelog
-
+@CHANGELOG@
diff --git a/rpm_spec/qubes-utils.spec b/rpm_spec/qubes-utils.spec.in
similarity index 92%
rename from rpm_spec/qubes-utils.spec
rename to rpm_spec/qubes-utils.spec.in
index 05a5f45..32d20da 100644
--- a/rpm_spec/qubes-utils.spec
+++ b/rpm_spec/qubes-utils.spec.in
@@ -1,12 +1,8 @@
-%define version %(cat version)
-%if 0%{?qubes_builder}
-%define _builddir %(pwd)
-%endif
-
 Name:		qubes-utils
-Version:	%{version}
+Version:	@VERSION@
 Release:	1%{?dist}
 Summary:	Common Linux files for Qubes Dom0 and VM
+Source0:    %{name}-%{version}.tar.gz
 
 Group:		Qubes
 License:	GPL
@@ -88,15 +84,10 @@ Release:	1%{?dist}
 Libraries for qubes-utils
 
 %prep
-# we operate on the current directory, so no need to unpack anything
-# symlink is to generate useful debuginfo packages
-rm -f %{name}-%{version}
-ln -sf . %{name}-%{version}
-%setup -T -D
-
+%setup -q
 
 %build
-make all
+make all BACKEND_VMM=@BACKEND_VMM@
 
 %install
 make install DESTDIR=%{buildroot} PYTHON=%{__python2}
@@ -161,4 +152,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libqubes-rpc-filecopy.so
 
 %changelog
-
+@CHANGELOG@