diff --git a/mash-notags.patch b/mash-notags.patch
new file mode 100644
index 0000000..19738e9
--- /dev/null
+++ b/mash-notags.patch
@@ -0,0 +1,84 @@
+diff --git a/configs/rawhide.mash b/configs/rawhide.mash
+index ba68d8f..6a68ef8 100644
+--- a/configs/rawhide.mash
++++ b/configs/rawhide.mash
+@@ -15,5 +15,3 @@ repoviewurl = http://download.fedoraproject.org/pub/fedora/linux/development/%(a
+ repoviewtitle = "Fedora Rawhide - %(arch)s"
+ arches = i386 x86_64 ppc ppc64
+ delta = True
+-# Change distro_tags as fedora-release version gets bumped
+-distro_tags = "cpe:/o:fedoraproject:fedora:11.92" "rawhide"
+diff --git a/mash/__init__.py b/mash/__init__.py
+index 2cf0d0a..ffba1b7 100644
+--- a/mash/__init__.py
++++ b/mash/__init__.py
+@@ -113,15 +113,6 @@ class Mash:
+                 md.set_delta(paths)
+         if previous:
+             md.set_previous(previous)
+-        # Setup the distro tags
+-        md.set_distro_tags(self.config.distro_tags)
+-        # Setup the content tags based on what we're making
+-        if arch == 'SRPMS':
+-            md.set_content_tags(['source'])
+-        elif path.endswith(self.config.debuginfo_path):
+-            md.set_content_tags(['debuginfo-%s' % arch])
+-        else:
+-            md.set_content_tags(['binary-%s' % arch])
+         md.run(path)
+         self.logger.info("createrepo: finished %s" % (path,))
+         if repoview and self.config.use_repoview:
+diff --git a/mash/config.py b/mash/config.py
+index 9a1842c..0d4abad 100644
+--- a/mash/config.py
++++ b/mash/config.py
+@@ -45,8 +45,6 @@ class MashConfig(config.BaseConfig):
+     delta = config.BoolOption(False)
+     delta_dirs = config.ListOption()
+     make_ancient = config.BoolOption(False)
+-    distro_tags = config.ListOption()
+-    content_tags = config.ListOption()
+     distros = []
+     
+ class MashDistroConfig(config.BaseConfig):
+@@ -77,8 +75,6 @@ class MashDistroConfig(config.BaseConfig):
+     delta = config.Inherit(MashConfig.delta)
+     delta_dirs = config.Inherit(MashConfig.delta_dirs)
+     make_ancient = config.Inherit(MashConfig.make_ancient)
+-    distro_tags = config.Inherit(MashConfig.distro_tags)
+-    content_tags = config.Inherit(MashConfig.content_tags)
+     previous = None
+ 
+ def readMainConfig(conf):
+diff --git a/mash/metadata.py b/mash/metadata.py
+index 4df23f2..1b37cab 100644
+--- a/mash/metadata.py
++++ b/mash/metadata.py
+@@ -73,14 +73,6 @@ class MetadataOld:
+     def set_previous(self, previous):
+         self.previous = previous
+ 
+-    def set_distro_tags(self, distro_tags):
+-        # Sorry, can't do that here.
+-        pass
+-
+-    def set_content_tags(self, content_tags):
+-        # Sorry, can't do that here.
+-        pass
+-
+     def run(self, path):
+         self.args.append(path)
+         if self.previous:
+@@ -139,12 +131,6 @@ class MetadataNew:
+               self.conf.update_md_path = previous
+         self.previous = previous
+ 
+-    def set_distro_tags(self, distro_tags):
+-        self.conf.distro_tags = distro_tags
+-
+-    def set_content_tags(self, content_tags):
+-        self.conf.content_tags = content_tags
+-
+     def _copy_in_deltas(self, path):
+         ts = rpmUtils.transaction.initReadOnlyTransaction()
+         ts.pushVSFlags((rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
diff --git a/mash.spec b/mash.spec
index edf3bdd..edf1444 100644
--- a/mash.spec
+++ b/mash.spec
@@ -2,13 +2,14 @@
 
 Name:           mash
 Version:        0.5.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Koji buildsystem to yum repository converter
 Group:          Development/Tools
 License:        GPL
 URL:            http://fedorahosted.org/releases/m/a/mash/
 Source0:        http://fedorahosted.org/releases/m/a/mash/%{name}-%{version}.tar.gz
 Patch0:		mash-nosigcheck.patch
+Patch1:		mash-notags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       yum, createrepo, koji
 Conflicts:	pungi < 1.0.0
@@ -23,6 +24,7 @@ any multlib RPMs that are necessary.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__python} setup.py build
@@ -46,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 /var/cache/mash
 
 %changelog
+* Tue Nov 10 2009 Bill Nottingham <notting@redhat.com> 0.5.9-2
+- revert distro_tags/content_tags for now
+
 * Mon Oct  5 2009 Bill Nottingham <notting@redhat.com> 0.5.9-1
 - set dist_tags & content_tags when making metadata; update rawhide config
   (<jkeating@redhat.com>)