diff --git a/common/qubes.repo b/common/qubes.fc13.repo
similarity index 71%
rename from common/qubes.repo
rename to common/qubes.fc13.repo
index 2b866e3b..35313425 100644
--- a/common/qubes.repo
+++ b/common/qubes.fc13.repo
@@ -1,12 +1,12 @@
 [qubes-vm-current]
 name = Qubes OS Repository for VM (updates)
-baseurl = http://yum.qubes-os.org/r1-beta1/current/vm
+baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f13
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 
 [qubes-vm-unstable]
 name = Qubes OS Repository for VM (unstable)
-baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm
+baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f13
 gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
 gpgcheck = 1
 enabled=0
diff --git a/common/qubes.fc14.repo b/common/qubes.fc14.repo
new file mode 100644
index 00000000..f069148a
--- /dev/null
+++ b/common/qubes.fc14.repo
@@ -0,0 +1,13 @@
+[qubes-vm-current]
+name = Qubes OS Repository for VM (updates)
+baseurl = http://yum.qubes-os.org/r1-beta1/current/vm/f14
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
+gpgcheck = 1
+
+[qubes-vm-unstable]
+name = Qubes OS Repository for VM (unstable)
+baseurl = http://yum.qubes-os.org/r1-beta1/unstable/vm/f14
+gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-qubes-1-primary
+gpgcheck = 1
+enabled=0
+
diff --git a/rpm_spec/core-commonvm.spec b/rpm_spec/core-commonvm.spec
index 0770ff55..97b1c8eb 100644
--- a/rpm_spec/core-commonvm.spec
+++ b/rpm_spec/core-commonvm.spec
@@ -65,7 +65,7 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/qubes
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
 cp iptables $RPM_BUILD_ROOT/etc/sysconfig/
 mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
-cp qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
+cp qubes%{dist}.repo $RPM_BUILD_ROOT/etc/yum.repos.d
 install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install -m 644 RPM-GPG-KEY-qubes* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 mkdir -p $RPM_BUILD_ROOT/sbin
@@ -171,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/init.d/qubes_core
 /etc/sysconfig/iptables
 /var/lib/qubes
-/etc/yum.repos.d/qubes.repo
+/etc/yum.repos.d/qubes%{dist}.repo
 /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
 /sbin/qubes_serial_login
 /usr/bin/xenstore-watch