diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp
index 75722a9..9c63e6f 100644
--- a/munin/manifests/init.pp
+++ b/munin/manifests/init.pp
@@ -173,6 +173,38 @@ class munin::server {
 	ensure => installed,
     }
     
+    if $munin_datadir {
+        file { "${munin_datadir}":
+            ensure  => directory,
+            mode    => 0755,
+            owner   => munin,
+            group   => munin,
+        }
+
+        file { "/var/lib/munin":
+            ensure  => "${munin_datadir}",
+            force   => true,
+            backup  => ".orig",
+            require => [ Package["munin"], File["${munin_datadir}"] ],
+        }
+    }
+
+    if $munin_htmldir {
+        file { "${munin_htmldir}":
+            ensure  => directory,
+            mode    => 0755,
+            owner   => munin,
+            group   => munin,
+        }
+
+        file { "/var/www/html/munin":
+            ensure  => "${munin_htmldir}",
+            force   => true,
+            backup  => ".orig",
+            require => [ Package["munin"], File["${munin_htmldir}"] ],
+        }
+    }
+
     file { "/etc/munin/nodes.d":
 	ensure  => directory,
 	purge   => true,