diff --git a/mock.spec b/mock.spec
index ffce7ed..e105cc8 100644
--- a/mock.spec
+++ b/mock.spec
@@ -26,8 +26,21 @@ rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
 # make the default.cfg link
 cd $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}
-ln -s fedora-development-i386-core.cfg default.cfg
 
+%if %{?fedora}
+if [ -f fedora-%{fedora}-%{_target_cpu}-core.cfg ]; then
+   	ln -s fedora-%{fedora}-%{_target_cpu}-core.cfg default.cfg
+fi
+%endif
+
+# if we haven't created a default link yet, try to do so as devel
+if [ ! -f default.cfg ]; then
+    if [ -f fedora-development-%{_target_cpu}-core.cfg ]; then
+        ln -s fedora-development-%{_target_cpu}-core.cfg default.cfg
+    else
+        ln -s fedora-development-i386-core.cfg default.cfg
+    fi
+fi
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -50,6 +63,9 @@ fi
 
 
 %changelog
+* Sun Jun 12 2005 Jeremy Katz <katzj@redhat.com> 
+- set default.cfg based on both arch and distro built for
+
 * Sat Jun 11 2005  Seth Vidal <skvidal@phy.duke.edu>
 - mock 0.3 - security release
 - mock-helper allowed execution of arbitrary commands by member of mock