diff --git a/Changelog b/Changelog
index 9f444174..54dedeea 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Sat Dec 08 Jesse Keating <jkeating@redhat.com>
+- Use a createrepo cache.
+
 * Tue Dec 04 Jesse Keating <jkeating@redhat.com>
 - Make logged output reusable in shell
 - Default to 670 for a CD size, so that we don't overflow
diff --git a/pypungi/pungi.py b/pypungi/pungi.py
index 1a93fe2f..20377e81 100755
--- a/pypungi/pungi.py
+++ b/pypungi/pungi.py
@@ -80,6 +80,10 @@ class Pungi(pypungi.PungiBase):
         createrepo.append('--groupfile')
         createrepo.append(compsfile)
 
+        createrepo.append('--cachedir')
+        createrepo.append(os.path.join(self.config.get('default', 'cachedir'),
+                                       'createrepocache'))
+
         createrepo.append(self.topdir)
 
         # run the command
@@ -301,6 +305,10 @@ class Pungi(pypungi.PungiBase):
         createrepo.append('--groupfile')
         createrepo.append(compsfile)
 
+        createrepo.append('--cachedir')
+        createrepo.append(os.path.join(self.config.get('default', 'cachedir'),
+                                       'createrepocache'))
+
         createrepo.append('--baseurl')
         createrepo.append('media://%s' % mediaid)