diff --git a/.cvsignore b/.cvsignore
index a33b08e..33daab1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mash-0.5.3.tar.gz
+mash-0.5.8.tar.gz
diff --git a/mash.spec b/mash.spec
index 2cd201e..c6a63b3 100644
--- a/mash.spec
+++ b/mash.spec
@@ -1,13 +1,14 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.5.3
-Release:        1%{?dist}
+Version:        0.5.8
+Release:        3%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.redhat.com/notting/mash/
-Source0:        http://people.redhat.com/notting/mash/%{name}-%{version}.tar.gz
+URL:            http://fedorahosted.org/releases/m/a/mash/
+Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
+Patch1:		mash-f12key.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -21,6 +22,7 @@ any multlib RPMs that are necessary.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -44,6 +46,33 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Tue Aug 11 2009 Bill Nottingham <notting@redhat.com> 0.5.8-3
+- add new F12 key to rawhide mash config
+
+* Fri Jul 24 2009 Bill Nottingham <notting@redhat.com> 0.5.8-2
+- disable deltas for rawhide during payload format mass rebuild
+
+* Mon Jun 29 2009 Bill Nottingham <notting@redhat.com> 0.5.8-1
+- noarch packages can have debuginfo too (#508746)
+- remove wine-arts from multilib whitelist (not needed, doesn't exist)
+
+* Tue Jun 23 2009 Bill Nottingham <notting@redhat.com> 0.5.7-1
+- when using previous runs for deltas, only look in the appropriate arch dirs
+- wine multilib fixes
+
+* Mon Jun 22 2009 Bill Nottingham <notting@redhat.com> 0.5.6-1
+- more gtk2 multilib (#507165)
+- minor transaction speedups
+- handle new yum arch-setting API. (<skvidal@fedoraproject.org>)
+
+* Fri May  8 2009 Bill Nottingham <notting@redhat.com> 0.5.5-1
+- fix setting delta_dirs in config file
+- canonicalize -o option if passed as a relative path
+
+* Wed May  6 2009 Bill Nottingham <notting@redhat.com> 0.5.4-1
+- allow configuring createrepo hash type
+- remove old config files
+
 * Mon Apr 27 2009 Bill Nottingham <notting@redhat.com> 0.5.3-1
 - when copying in old deltas, make sure the signatures match current packages
 - don't delta source and debuginfo packages
diff --git a/sources b/sources
index 2d9f83d..f5057bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a487d6e4192fb01b44dfb6aa46caa571  mash-0.5.3.tar.gz
+bf01baab29a01b70028bd2668d4455ea  mash-0.5.8.tar.gz