diff --git a/rpm_spec/core-dom0.spec b/rpm_spec/core-dom0.spec.in
similarity index 97%
rename from rpm_spec/core-dom0.spec
rename to rpm_spec/core-dom0.spec.in
index 3780fbed..bd5c8679 100644
--- a/rpm_spec/core-dom0.spec
+++ b/rpm_spec/core-dom0.spec.in
@@ -22,18 +22,13 @@
 #
 #
 
-%{!?version: %define version %(cat version)}
-
-# debug_package hack should be removed when BuildArch:noarch is enabled below
-%define debug_package %{nil}
-
 %define _dracutmoddir	/usr/lib/dracut/modules.d
 %if %{fedora} < 17
 %define _dracutmoddir   /usr/share/dracut/modules.d
 %endif
 
 Name:		qubes-core-dom0
-Version:	%{version}
+Version:	@VERSION@
 Release:	1%{dist}
 Summary:	The Qubes core files (Dom0-side)
 
@@ -111,17 +106,18 @@ Provides:	qubes-core-dom0-doc
 # Prevent preupgrade from installation (it pretend to provide distribution upgrade)
 Obsoletes:	preupgrade < 2.0
 Provides:	preupgrade = 2.0
+
+Source0: %{name}-%{version}.tar.gz
+
+%if 0%{?qubes_builder}
 %define _builddir %(pwd)
+%endif
 
 %description
 The Qubes core files for installation on Dom0.
 
 %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