diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index e624cc2..ba9726e 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -60,45 +60,32 @@ class confdroid_nagios::main::dirs (
       seltype  => nagios_etc_t,
       seluser  => system_u,
     }
-  # /usr/lib64/nagios dir required for plugins
-#  file { $ng_lib_dir:
-#    ensure   => directory,
-#    path     => $ng_lib_dir,
-#    owner    => 'root',
-#    group    => 'root',
-#    mode     => '0755',
-#    selrange => s0,
-#    selrole  => object_r,
-#    seltype  => lib_t,
-#    seluser  => system_u,
-#  }
 
-  # /var/spool/nagios
-#  file { $ng_spool_dir:
-#    ensure   => directory,
-#    path     => $ng_spool_dir,
-#    owner    => 'nagios',
-#    group    => 'nagios',
-#    mode     => '0755',
-#    selrange => s0,
-#    selrole  => object_r,
-#    seltype  => nagios_spool_t,
-#    seluser  => system_u,
-#  }
+    # /usr/lib64/nagios dir required for plugins
+    file { $ng_lib_dir:
+      ensure   => directory,
+      path     => $ng_lib_dir,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => lib_t,
+      seluser  => system_u,
+    }
 
-
-    # /etc/nagios/conf.d
-#    file { $ng_conf_d_dir:
-#      ensure   => directory,
-#      path     => $ng_conf_d_dir,
-#      owner    => 'root',
-#      group    => 'nagios',
-#      mode     => '0750',
-#      selrange => s0,
-#      selrole  => object_r,
-#      seltype  => nagios_etc_t,
-#      seluser  => system_u,
-#    }
+    # /var/spool/nagios
+    file { $ng_spool_dir:
+      ensure   => directory,
+      path     => $ng_spool_dir,
+      owner    => 'nagios',
+      group    => 'nagios',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_spool_t,
+      seluser  => system_u,
+    }
 
     # include dir
 #    file { $ng_usr_incl:
@@ -204,4 +191,31 @@ class confdroid_nagios::main::dirs (
 #      seluser  => system_u,
 #    }
   }
+
+  if $ng_nagios_server  != $fqdn {
+    # ensure client directories exist on server for potential future use
+    file { $ng_lib_dir:
+      ensure   => directory,
+      path     => $ng_lib_dir,
+      owner    => 'root',
+      group    => 'root',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => usr_t,
+      seluser  => system_u,
+    }
+
+    file { $ng_spool_dir:
+      ensure   => directory,
+      path     => $ng_spool_dir,
+      owner    => 'nagios',
+      group    => 'nagios',
+      mode     => '0755',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_spool_t,
+      seluser  => system_u,
+    }
+  }
 }