diff --git a/modules/graphite/manifests/init.pp b/modules/graphite/manifests/init.pp
index f681bc8dab..5f94c2cbb7 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -218,5 +218,15 @@ class graphite(
                     Vcsrepo['/opt/statsd']],
   }
 
+  # remove any stats that haven't been updated for ~9 months and
+  # remove empty dirs
+  cron { 'remove_old_stats':
+    user        => 'root',
+    hour        => '2',
+    minute      => '0',
+    command     => 'find /var/lib/graphite/storage/whisper -type f -mtime +270 -name \*.wsp -delete; find /var/lib/graphite/storage/whisper -depth -type d -empty -delete > /dev/null',
+    environment => 'PATH=/usr/bin:/bin:/usr/sbin:/sbin',
+  }
+
 }