diff --git a/Changelog b/Changelog
index 44f564f1..9c6bf605 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Fri Mar 21 2008 Jesse Keating <jkeating@redhat.com>
+- Handle shared source directory better.
+
 * Fri Mar 14 2008 Jesse Keating <jkeating@redhat.com>
 - Don't pass --prodpath to buildinstall.  It won't like it.
 - Fix source iso making
diff --git a/src/pypungi/gather.py b/src/pypungi/gather.py
index 008cb92d..c862e0f0 100755
--- a/src/pypungi/gather.py
+++ b/src/pypungi/gather.py
@@ -332,7 +332,11 @@ class Gather(pypungi.PungiBase):
                               relpkgdir)
 
         # Ensure the pkgdir exists, force if requested, and make sure we clean it out
-        pypungi._ensuredir(pkgdir, self.logger, force=self.config.getboolean('default', 'force'), clean=True)
+        if relpkgdir.endswith('SRPMS'):
+            # Since we share source dirs with other arches don't clean, but do allow us to use it
+            pypungi._ensuredir(pkgdir, self.logger, force=True, clean=False)
+        else:
+            pypungi._ensuredir(pkgdir, self.logger, force=self.config.getboolean('default', 'force'), clean=True)
 
         probs = self.ayum.downloadPkgs(polist)