diff --git a/munin/manifests/init.pp b/munin/manifests/init.pp
index d0c4bcb..8e40e25 100644
--- a/munin/manifests/init.pp
+++ b/munin/manifests/init.pp
@@ -290,8 +290,13 @@ class munin::server {
             ensure  => $munin_datadir,
             force   => true,
             backup  => ".orig",
+            seltype => "usr_t",
             require => File[$munin_datadir],
         }
+        selinux::manage_fcontext { "/var/lib/munin":
+            type   => "usr_t",
+            before => File["/var/lib/munin"],
+        }
     }
 
     file { "/var/cache/munin":
@@ -299,11 +304,11 @@ class munin::server {
         mode    => "0775",
         owner   => "munin",
         group   => $apache::sslserver::group,
-        seltype => "httpd_sys_rw_content_t",
+        seltype => "httpd_munin_rw_content_t",
         require => Package["munin"],
     }
     selinux::manage_fcontext { "/var/cache/munin(/.*)?":
-        type   => "httpd_sys_rw_content_t",
+        type   => "httpd_munin_rw_content_t",
         before => File["/var/cache/munin"],
     }
     mount { "/var/cache/munin":