diff --git a/.gitignore b/.gitignore
index e6e0350..a611e45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@ debian/source/local-options
 debian/split-gpg2*.debhelper*
 debian/split-gpg2/
 debian/split-gpg2.substvars
+pkgs/
+debian/changelog.*
diff --git a/Makefile.builder b/Makefile.builder
new file mode 100644
index 0000000..86bcaf4
--- /dev/null
+++ b/Makefile.builder
@@ -0,0 +1,11 @@
+ifeq ($(PACKAGE_SET),dom0)
+  RPM_SPEC_FILES := rpm_spec/split-gpg2-dom0.spec
+else ifeq ($(PACKAGE_SET),vm)
+  ifneq ($(filter $(DISTRIBUTION), debian qubuntu),)
+    DEBIAN_BUILD_DIRS := debian
+  endif
+
+  RPM_SPEC_FILES := rpm_spec/split-gpg2.spec
+endif
+
+# vim: filetype=make
diff --git a/rpm_spec/split-gpg2-dom0.spec b/rpm_spec/split-gpg2-dom0.spec.in
similarity index 78%
rename from rpm_spec/split-gpg2-dom0.spec
rename to rpm_spec/split-gpg2-dom0.spec.in
index 562e0ac..24bfc8b 100644
--- a/rpm_spec/split-gpg2-dom0.spec
+++ b/rpm_spec/split-gpg2-dom0.spec.in
@@ -1,14 +1,13 @@
 Name:           split-gpg2-dom0
-Version:        0.1
+Version:        @VERSION@
 Release:        1%{dist}
 Summary:        split-gpg2 Qubes RPC Policy for dom0
+BuildArch:      noarch
 
 Group:          Qubes
 License:        GPLv2+
 
-Source:         .
-
-%define _builddir %(pwd)
+Source0: split-gpg2-%{version}.tar.gz
 
 %description
 split-gpg2 allows you to run the gpg2 client in a different Qubes-Domain than
@@ -17,6 +16,7 @@ the gpg-agent.
 This package contains the Qubes RPC policy for split-gpg2.
 
 %prep
+%setup -q -n split-gpg2-%{version}
 
 %build
 
@@ -29,3 +29,6 @@ install -D qubes.Gpg2.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.Gpg2
 
 %files
 %config(noreplace) %attr(0664,root,qubes) /etc/qubes-rpc/policy/qubes.Gpg2
+
+%changelog
+@CHANGELOG@
diff --git a/rpm_spec/split-gpg2.spec b/rpm_spec/split-gpg2.spec.in
similarity index 88%
rename from rpm_spec/split-gpg2.spec
rename to rpm_spec/split-gpg2.spec.in
index 7872eaf..d3bae8e 100644
--- a/rpm_spec/split-gpg2.spec
+++ b/rpm_spec/split-gpg2.spec.in
@@ -1,30 +1,29 @@
 Name:           split-gpg2
-Version:        0.1
+Version:        @VERSION@
 Release:        1%{dist}
 Summary:        split-gpg2 for Qubes
+BuildArch:      noarch
 
 Group:          Qubes
 License:        GPLv2+
 
-Source:         .
+Source0:        %{name}-%{version}.tar.gz
 
 BuildRequires:  python3-rpm-macros
 BuildRequires:  python%{python3_pkgversion}-setuptools
 Requires:       socat
-Requires:       ruby >= 1.9
 Requires:       bash
 #Requires:       gnupg >= 2.1.0
 Requires:       systemd
 Requires:       zenity
 Requires:       libnotify
 
-%define _builddir %(pwd)
-
 %description
 split-gpg2 allows you to run the gpg2 client in a different Qubes-Domain than
 the gpg-agent.
 
 %prep
+%setup -q
 
 %build
 make PYTHON=%{__python3}
@@ -49,3 +48,6 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitelib}/splitgpg2-*.egg-info
 /usr/share/split-gpg2/
 /usr/share/doc/split-gpg2/
+
+%changelog
+@CHANGELOG@
diff --git a/version b/version
new file mode 100644
index 0000000..49d5957
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+0.1