diff --git a/.gitignore b/.gitignore
index f386e86..1b27a10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /mash-*.tar.gz
+/mash-0.6.12.tar.bz2
diff --git a/mash.spec b/mash.spec
index 5ab863b..01234e9 100644
--- a/mash.spec
+++ b/mash.spec
@@ -1,13 +1,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           mash
-Version:        0.6.11
+Version:        0.6.12
 Release:        1%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://fedorahosted.org/releases/m/a/mash/
-Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
+Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.bz2
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
 BuildRequires:  python-devel
@@ -42,6 +42,9 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/mash
 /var/cache/mash
 
 %changelog
+* Thu Jul 10 2014 Kevin Fenzi <kevin@scrye.com> 0.6.12-1
+- Update to 0.6.12 for new f21 branch/f22 rawhide. 
+
 * Tue Jun 24 2014 Dennis Gilmore <dennis@ausil.us> - 0.6.11-1
 - enable ppc64le mashing for branched and rawhide ppc composes
 
@@ -174,7 +177,7 @@ mkdir -p $RPM_BUILD_ROOT/var/cache/mash
 - fix arm dependency checks (<dennis@ausil.us>)
 - fix key ordering
 
-* Tue Feb 10 2011 Bill Nottingham <notting@redhat.com> 0.5.21-1
+* Thu Feb 10 2011 Bill Nottingham <notting@redhat.com> 0.5.21-1
 - update configs for F15 (<dennis@ausil.us>)
 - add a knob for frobbing which ppc arch is preferred (<jwboyer@gmail.com>)
 - fix gdk-pixbuf loader path (#649339)
diff --git a/sources b/sources
index ecf1959..6f3d2ec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e2b3889a22ca40e170658a719f3223b9  mash-0.6.11.tar.gz
+f66cb68e6815fba7226aa4de67f611c9  mash-0.6.12.tar.bz2