diff --git a/contrib/tmpfiles.d/pungi-clean-cache.conf b/contrib/tmpfiles.d/pungi-clean-cache.conf
new file mode 100644
index 00000000..fc82c3aa
--- /dev/null
+++ b/contrib/tmpfiles.d/pungi-clean-cache.conf
@@ -0,0 +1,2 @@
+# Clean up pungi cache
+d /var/cache/pungi/createrepo_c/ - - - 30d
diff --git a/setup.py b/setup.py
index 47203c82..7f8bb669 100755
--- a/setup.py
+++ b/setup.py
@@ -49,6 +49,7 @@ setup(
     },
     scripts=["contrib/yum-dnf-compare/pungi-compare-depsolving"],
     data_files=[
+        ("/usr/lib/tmpfiles.d", glob.glob("contrib/tmpfiles.d/*.conf")),
         ("/usr/share/pungi", glob.glob("share/*.xsl")),
         ("/usr/share/pungi", glob.glob("share/*.ks")),
         ("/usr/share/pungi", glob.glob("share/*.dtd")),