diff --git a/arch-specific-repo.patch b/arch-specific-repo.patch
new file mode 100644
index 0000000..761f062
--- /dev/null
+++ b/arch-specific-repo.patch
@@ -0,0 +1,333 @@
+--- etc/fedora-4-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-4-ppc-core.cfg	2006-11-03 15:30:39.000000000 -0500
+@@ -20,11 +20,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
+ 
+ [groups]
+ name=groups
+@@ -32,7 +32,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
+ 
+ [local]
+ name=local
+--- etc/fedora-5-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-5-i386-core.cfg	2006-11-03 15:43:12.000000000 -0500
+@@ -20,11 +20,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=i386
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=i386
+ 
+ [groups]
+ name=groups
+@@ -32,7 +32,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
+ 
+ [local]
+ name=local
+--- etc/fedora-3-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-3-i386-core.cfg	2006-11-03 15:25:55.000000000 -0500
+@@ -19,11 +19,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/i386/os
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/i386
+ 
+ 
+ [groups]
+@@ -32,7 +32,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/i386
+ 
+ [local]
+ name=local
+--- etc/fedora-5-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-5-x86_64-core.cfg	2006-11-03 15:46:11.000000000 -0500
+@@ -21,11 +21,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=x86_64
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=x86_64
+ 
+ [groups]
+ name=groups
+@@ -33,7 +33,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=x86_64
+ 
+ [local]
+ name=local
+--- etc/fedora-5-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-5-ppc-core.cfg	2006-11-03 15:44:53.000000000 -0500
+@@ -20,11 +20,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-5&arch=ppc
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc5&arch=ppc
+ 
+ [groups]
+ name=groups
+@@ -32,7 +32,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-5
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
+ 
+ [local]
+ name=local
+--- etc/fedora-6-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-6-x86_64-core.cfg	2006-11-03 15:50:34.000000000 -0500
+@@ -21,7 +21,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=x86_64
++
++[updates-released]
++name=updates
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=x86_64
+ 
+ [groups]
+ name=groups
+@@ -29,7 +33,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-6&arch=x86_64
+ 
+ [local]
+ name=local
+--- etc/fedora-devel-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-devel-x86_64-core.cfg	2006-11-03 15:57:08.000000000 -0500
+@@ -21,7 +21,7 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=x86_64
+ 
+ [groups]
+ name=groups
+@@ -29,7 +29,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=x86_64
+ 
+ [local]
+ name=local
+--- etc/fedora-4-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-4-x86_64-core.cfg	2006-11-03 15:31:21.000000000 -0500
+@@ -20,12 +20,12 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/x86_64/os
+ 
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/x86_64
+ 
+ [groups]
+ name=groups
+@@ -33,6 +33,7 @@
+ 
+ [extras]
+ name=extras
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/x86_64
+ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
+ 
+ [local]
+--- etc/fedora-3-x86_64-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-3-x86_64-core.cfg	2006-11-03 15:59:55.000000000 -0500
+@@ -19,12 +19,12 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-3
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/3/x86_64/os
+ 
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc3
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/3/x86_64
+ 
+ [groups]
+ name=groups
+@@ -32,7 +32,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-3
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/3/x86_64
+ 
+ [local]
+ name=local
+--- etc/fedora-devel-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-devel-ppc-core.cfg	2006-11-03 15:56:39.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=ppc
+ 
+ [groups]
+ name=groups
+@@ -28,7 +28,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=ppc
+ 
+ [local]
+ name=local
+--- etc/fedora-devel-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-devel-i386-core.cfg	2006-11-03 15:55:54.000000000 -0500
+@@ -20,7 +20,7 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=i386
+ 
+ [groups]
+ name=groups
+@@ -28,7 +28,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-devel&arch=i386
+ 
+ [local]
+ name=local
+--- etc/fedora-4-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-4-i386-core.cfg	2006-11-03 15:29:44.000000000 -0500
+@@ -20,11 +20,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/4/i386/os
+ 
+ [updates-released]
+ name=updates
+-mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/core/updates/4/i386
+ 
+ 
+ [groups]
+@@ -33,7 +33,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-4
++baseurl=http://download.fedoraproject.org/pub/fedora/linux/extras/4/i386
+ 
+ [local]
+ name=local
+--- etc/fedora-6-i386-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-6-i386-core.cfg	2006-11-03 15:48:02.000000000 -0500
+@@ -20,7 +20,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=i386
++
++[updates-released]
++name=updates
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=i386
+ 
+ [groups]
+ name=groups
+@@ -28,7 +32,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=i386
+ 
+ [local]
+ name=local
+--- etc/fedora-6-ppc-core.cfg.jk	2006-11-03 15:16:00.000000000 -0500
++++ etc/fedora-6-ppc-core.cfg	2006-11-03 15:49:06.000000000 -0500
+@@ -20,7 +20,11 @@
+ 
+ [core]
+ name=core
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-6
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=core-6&arch=ppc
++
++[updates-released]
++name=updates
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-fc6&arch=ppc
+ 
+ [groups]
+ name=groups
+@@ -28,7 +32,7 @@
+ 
+ [extras]
+ name=extras
+-mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-6
++mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=extras-5&arch=ppc
+ 
+ [local]
+ name=local
diff --git a/mock.spec b/mock.spec
index 49fbea9..c117627 100644
--- a/mock.spec
+++ b/mock.spec
@@ -1,7 +1,7 @@
 Summary: Builds packages inside chroots
 Name: mock
 Version: 0.6.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Development/Tools
 Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: python, yum >= 2.2.1
 Requires(pre): shadow-utils
 BuildRequires: libselinux-devel
+Patch0: arch-specific-repo.patch
 
 
 %description
@@ -17,6 +18,7 @@ Mock takes a srpm and builds it in a chroot
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -73,6 +75,9 @@ fi
 
 
 %changelog
+* Fri Nov  3 2006 Jesse Keating <jkeating@redhat.com> - 0.6.8-2
+- Add patch to fix repo files to use arch specific repos (#213516)
+
 * Mon Oct 30 2006 Clark Williams <williams@redhat.com> - 0.6.8-1
 - respun tarballs without buildsys rpms