diff --git a/qubes-release/qubes-dom0-r2-beta2.repo b/qubes-release/qubes-dom0-r2-beta2.repo
deleted file mode 100644
index 72b5256..0000000
--- a/qubes-release/qubes-dom0-r2-beta2.repo
+++ /dev/null
@@ -1,24 +0,0 @@
-[qubes-dom0-r2b2-current]
-name = Qubes Dom0 Repository (updates)
-baseurl = http://yum.qubes-os.org/r$releasever-beta2/current/dom0
-enabled = 0
-metadata_expire = 7d
-gpgcheck = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
-
-[qubes-dom0-r2b2-current-testing]
-name = Qubes Dom0 Repository (updates-testing)
-baseurl = http://yum.qubes-os.org/r$releasever-beta2/current-testing/dom0
-enabled = 0
-metadata_expire = 7d
-gpgcheck = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
-
-[qubes-dom0-r2b2-unstable]
-name = Qubes Dom0 Repository (unstable)
-baseurl = http://yum.qubes-os.org/r$releasever-beta2/unstable/dom0
-enabled = 0
-metadata_expire = 7d
-gpgcheck = 1
-gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-unstable
-
diff --git a/qubes-release/qubes-dom0-r2-beta3.repo b/qubes-release/qubes-dom0.repo.in
similarity index 78%
rename from qubes-release/qubes-dom0-r2-beta3.repo
rename to qubes-release/qubes-dom0.repo.in
index 428cc00..afb9083 100644
--- a/qubes-release/qubes-dom0-r2-beta3.repo
+++ b/qubes-release/qubes-dom0.repo.in
@@ -1,22 +1,22 @@
-[qubes-dom0-r2b3-current]
+[qubes-dom0-current]
 name = Qubes Dom0 Repository (updates)
-baseurl = http://yum.qubes-os.org/r$releasever-beta3/current/dom0
+baseurl = http://yum.qubes-os.org/r$releasever/current/dom0/%DIST%
 enabled = 1
 metadata_expire = 7d
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
-[qubes-dom0-r2b3-current-testing]
+[qubes-dom0-current-testing]
 name = Qubes Dom0 Repository (updates-testing)
-baseurl = http://yum.qubes-os.org/r$releasever-beta3/current-testing/dom0
+baseurl = http://yum.qubes-os.org/r$releasever-beta3/current-testing/dom0/%DIST%
 enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-$releasever-primary
 
-[qubes-dom0-r2b3-unstable]
+[qubes-dom0-unstable]
 name = Qubes Dom0 Repository (unstable)
-baseurl = http://yum.qubes-os.org/r$releasever-beta3/unstable/dom0
+baseurl = http://yum.qubes-os.org/r$releasever-beta3/unstable/dom0/%DIST%
 enabled = 0
 metadata_expire = 7d
 gpgcheck = 1
diff --git a/qubes-release/qubes-release.spec b/qubes-release/qubes-release.spec
index 2586eac..2e7fd43 100644
--- a/qubes-release/qubes-release.spec
+++ b/qubes-release/qubes-release.spec
@@ -1,6 +1,6 @@
 %define dist_version 2
 %define release_name R%{dist_version}
-%define fedora_base_version 18
+%define fedora_base_version %{fedora}
 
 %if 0%{?qubes_builder}
 %define _builddir %(pwd)/qubes-release
@@ -72,9 +72,10 @@ install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
-for file in {qubes,fedora,fedora-updates}*repo ; do
+for file in {fedora,fedora-updates}*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
+sed -e "s/%%DIST%%/fc%{fedora_base_version}/" qubes-dom0.repo.in > $RPM_BUILD_ROOT/etc/yum.repos.d/qubes-dom0.repo
 
 install -d -m 755 $RPM_BUILD_ROOT/usr/share/qubes
 %if 0%{?qubes_builder}
@@ -115,8 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/fedora.repo
 %config(noreplace) /etc/yum.repos.d/fedora-updates.repo
-%config(noreplace) /etc/yum.repos.d/qubes-dom0-r2-beta2.repo
-%config(noreplace) /etc/yum.repos.d/qubes-dom0-r2-beta3.repo
+%config(noreplace) /etc/yum.repos.d/qubes-dom0.repo
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist