diff --git a/0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch b/0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch
new file mode 100644
index 0000000..0d2b2be
--- /dev/null
+++ b/0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch
@@ -0,0 +1,33 @@
+From d7aae0860cf75be76463251978cd63af6aec87a7 Mon Sep 17 00:00:00 2001
+From: Bill Nottingham <notting@redhat.com>
+Date: Wed, 29 Oct 2008 11:54:55 -0400
+Subject: [PATCH] Fall back to the unsigned path when checking ExcludeArch/ExclusiveArch, as well.
+
+---
+ mash/__init__.py |   10 +++++++++-
+ 1 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/mash/__init__.py b/mash/__init__.py
+index f9f94dc..eafb1d7 100644
+--- a/mash/__init__.py
++++ b/mash/__init__.py
+@@ -216,7 +216,15 @@ class Mash:
+                     os.mkdir(os.path.dirname(cachepath))
+                 except:
+                     pass
+-                result = urlgrabber.grabber.urlgrab(path,cachepath)
++                try:
++                    result = urlgrabber.grabber.urlgrab(path, cachepath)
++                except:
++                    path = os.path.join(koji.pathinfo.build(builds_hash[pkg['build_id']]), koji.pathinfo.rpm(pkg))
++                    try:
++                        result = urlgrabber.grabber.urlgrab(path, cachepath)
++                    except:
++                        print "WARNING: can't download %s from %s" % (nevra(pkg), srcurl)
++                        return None
+ 
+             fd = open(result)
+             return fd
+-- 
+1.6.0.3
+
diff --git a/mash.spec b/mash.spec
index c8acd7c..27a111f 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,7 +2,7 @@
 
 Name:           mash
 Version:        0.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
@@ -13,7 +13,7 @@ Requires:       yum, createrepo >= 0.9.2, koji
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
 BuildArch:      noarch
-Patch1:         rawhide-ignore-f10-key.patch
+Patch1:         0001-Fall-back-to-the-unsigned-path-when-checking-Exclude.patch
 
 %description
 mash is a tool that queries a koji buildsystem for the latest RPMs for
@@ -22,7 +22,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
-%patch1 -p2
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -46,6 +46,10 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Thu Oct 30 2008 Jesse Keating <jkeating@redhat.com> - 0.4.2-3
+- Add patch from upstream that hasn't been relased yet.
+- Drop patch to ignore F10 key.
+
 * Wed Oct 29 2008 Jesse Keating <jkeating@redhat.com> - 0.4.2-2
 - Ignore the F10 key in favor of F10-beta key for now, until all builds are
   written out with the F10 key.  This prevents us from falling back to
diff --git a/rawhide-ignore-f10-key.patch b/rawhide-ignore-f10-key.patch
deleted file mode 100644
index e424d1a..0000000
--- a/rawhide-ignore-f10-key.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./mash-0.4.2/configs/rawhide.mash.jk ./mash-0.4.2/configs/rawhide.mash
---- ./mash-0.4.2/configs/rawhide.mash.jk	2008-10-29 18:04:32.000000000 -0700
-+++ ./mash-0.4.2/configs/rawhide.mash	2008-10-29 18:04:41.000000000 -0700
-@@ -10,7 +10,7 @@ multilib_method = devel
- tag = dist-rawhide
- inherit = True
- strict_keys = False
--keys = 4EBFC273, 0B86274E, 6DF2196F, DF9B0AE9
-+keys = 0B86274E, 6DF2196F, DF9B0AE9
- repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(arch)s/os/
- repoviewtitle = "Fedora Rawhide - %(arch)s"
- arches = i386 x86_64 ppc ppc64
diff --git a/rawhide-to-development.patch b/rawhide-to-development.patch
deleted file mode 100644
index 630b636..0000000
--- a/rawhide-to-development.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up mash-0.4.1/configs/rawhide.mash.jk mash-0.4.1/configs/rawhide.mash
---- mash-0.4.1/configs/rawhide.mash.jk	2008-09-15 11:31:47.000000000 -0700
-+++ mash-0.4.1/configs/rawhide.mash	2008-09-16 08:22:13.000000000 -0700
-@@ -1,6 +1,6 @@
- # mash config file
- 
--[rawhide]
-+[development]
- rpm_path = %(arch)s/os/Packages
- repodata_path = %(arch)s/os/
- source_path = source/SRPMS