diff --git a/manifests/params.pp b/manifests/params.pp
index be0253d..13628b9 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -246,7 +246,7 @@ class confdroid_nagios::params (
   $ng_cntctgrps_head_erb      = 'confdroid_nagios/nagios/contactgroups_cfg_head.erb'
   $ng_cntctgrps_rule_erb      = 'confdroid_nagios/nagios/contactgroups_cfg_rule.erb'
   $ng_target_command          = "${ng_conf_d_dir}/nagios_commands_base.cfg"
-  $ng_service_cmd             = 'check_nagios!/var/log/nagios/status.dat!5!/usr/sbin/nagios'
+  $ng_service_cmd             = 'check_nagios!/var/spool/nagios/status.dat!5!/usr/sbin/nagios'
   $ng_htpasswd_file           = "${ng_main_dir}/passwd"
   $ng_htpasswd_head           = 'confdroid_nagios/nagios/htpasswd_head.erb'
   $ng_htpasswd_rule           = 'confdroid_nagios/nagios/htpasswd_rule.erb'
diff --git a/manifests/server/service.pp b/manifests/server/service.pp
index b116666..79259bc 100644
--- a/manifests/server/service.pp
+++ b/manifests/server/service.pp
@@ -44,7 +44,7 @@ class confdroid_nagios::server::service (
     }
 
     @@nagios_service { 'check_nagios_localhost':
-      check_command       => 'check_nagios',
+      check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
       use                 => 'generic-service',
       host_name           => 'localhost',
       notification_period => '24x7',