diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 50042c5..815f3b2 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -137,6 +137,70 @@ class puppet::server inherits puppet::client {
         ensure => installed,
     }
 
+    if $puppet_datadir {
+        file { "${puppet_datadir}":
+            ensure => directory,
+            mode   => 0755,
+            owner  => root,
+            group  => root,
+        }
+        file { "/srv/puppet":
+            ensure  => link,
+            target  => "${puppet_datadir}",
+            require => File["${puppet_datadir}"],
+        }
+    } else {
+        file { "/srv/puppet":
+            ensure => directory,
+            mode   => 0755,
+            owner  => root,
+            group  => root,
+        }
+    }
+
+    if $puppet_storeconfigs != "none" {
+        file { "/srv/puppet/storeconfigs":
+            ensure  => directory,
+            mode    => 0750,
+            owner   => puppet,
+            group   => puppet,
+            require => [ File["/srv/puppet"],
+                         Package["puppet-server"], ],
+        }
+    }
+    file { [ "/srv/puppet/bucket",
+             "/srv/puppet/reports",
+             "/srv/puppet/rrd", ]:
+        ensure  => directory,
+        mode    => 0750,
+        owner   => puppet,
+        group   => puppet,
+        require => [ File["/srv/puppet"],
+                     Package["puppet-server"], ],
+    }
+    file { "/srv/puppet/files":
+        ensure  => directory,
+        mode    => 0755,
+        owner   => root,
+        group   => root,
+        require => File["/srv/puppet"],
+    }
+    file { "/srv/puppet/files/common":
+        ensure  => directory,
+        mode    => 0755,
+        owner   => root,
+        group   => root,
+        require => File["/srv/puppet/files"],
+    }
+    file { "/srv/puppet/files/private":
+        ensure  => directory,
+        mode    => 0750,
+        owner   => root,
+        group   => puppet,
+        require => [ File["/srv/puppet/files"],
+                     Package["puppet-server"], ],
+    }
+
     service { "puppetmaster":
         ensure    => running,
         enable    => true,