diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index b4165c0..73d46b4 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -292,8 +292,6 @@ class puppet::server::common inherits puppet::client {
         }
     }
 
-    include ruby::rrd
-
     if $puppet_datadir {
         file { $puppet_datadir:
             ensure  => directory,
@@ -339,8 +337,7 @@ class puppet::server::common inherits puppet::client {
     }
 
     file { [ "/srv/puppet/bucket",
-             "/srv/puppet/reports",
-             "/srv/puppet/rrd", ]:
+             "/srv/puppet/reports", ]:
         ensure  => directory,
         mode    => "0750",
         owner   => $user,
diff --git a/puppet/templates/puppetmaster.conf.erb b/puppet/templates/puppetmaster.conf.erb
index 654a0f0..0531c66 100644
--- a/puppet/templates/puppetmaster.conf.erb
+++ b/puppet/templates/puppetmaster.conf.erb
@@ -5,10 +5,7 @@
 [puppetmasterd]
 <% end -%>
     # Enable reporting on server.
-    reports = tagmail,store,rrdgraph
-
-    rrdgraph = true
-    rrddir = /srv/puppet/rrd
+    reports = tagmail,store
 
     report = true
     reportdir = /srv/puppet/reports