diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index 6aeefae..b361557 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -352,10 +352,14 @@ class puppet::server::common inherits puppet::client {
             seltype => "usr_t",
             require => File[$puppet_datadir],
         }
-        selinux::manage_fcontext { "/srv/puppet(/.*)?":
+        selinux::manage_fcontext { "/srv/puppet":
             type   => "usr_t",
             before => File["/srv/puppet"],
         }
+        selinux::manage_fcontext { "/srv/puppet/.*":
+            type   => $seltype,
+            before => File["/srv/puppet"],
+        }
     } else {
         file { "/srv/puppet":
             ensure  => directory,