diff --git a/puppet/files/fileserver.conf b/puppet/files/fileserver.conf
new file mode 100644
index 0000000..0f2ba5e
--- /dev/null
+++ b/puppet/files/fileserver.conf
@@ -0,0 +1,7 @@
+[files]
+  path /srv/puppet/files/common
+  allow *
+
+[private]
+  path /srv/puppet/files/private/%H
+  allow *
diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index b92deac..a8d776b 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -117,15 +117,28 @@ class puppet::server inherits puppet::client {
     }
 
     file { "/etc/puppet/tagmail.conf":
-        ensure => present,
-        source => [ "puppet:///files/puppet/tagmail.conf.${fqdn}",
-                    "puppet:///files/puppet/tagmail.conf",
-                    "puppet:///puppet/tagmail.conf", ],
-        mode   => 0644,
-        owner  => root,
-        group  => root,
+        ensure  => present,
+        source  => [ "puppet:///files/puppet/tagmail.conf.${fqdn}",
+                     "puppet:///files/puppet/tagmail.conf",
+                     "puppet:///puppet/tagmail.conf", ],
+        mode    => 0644,
+        owner   => root,
+        group   => root,
+        require => Package["puppet-server"],
     }
 
+    file { "/etc/puppet/fileserver.conf":
+        ensure  => present,
+        source  => [ "puppet:///files/puppet/fileserver.conf.${fqdn}",
+                     "puppet:///files/puppet/fileserver.conf",
+                     "puppet:///puppet/fileserver.conf", ],
+        mode    => 0644,
+        owner   => root,
+        group   => root,
+        require => Package["puppet-server"],
+        notify  => Service["puppetmaster"],
+    }
+    
     file { "/etc/sysconfig/puppetmaster":
         ensure  => present,
         content => template("puppet/puppetmaster.sysconfig.erb"),