diff --git a/manifests/client/target.pp b/manifests/client/target.pp
index 16802f9..2711f24 100644
--- a/manifests/client/target.pp
+++ b/manifests/client/target.pp
@@ -11,6 +11,11 @@ class confdroid_nagios::client::target (
       ensure => $ng_pkg_ensure,
     }
 
+    # if we want to use NRPE on clients, install it
+    if $ng_include_nrpe == true {
+      require confdroid_nrpe
+    }
+
     @@nagios_host { $fqdn:
       ensure              => $ng_ping_ensure,
       alias               => $hostname,
diff --git a/manifests/main/install.pp b/manifests/main/install.pp
index 7dbeff4..a04cf4a 100644
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -16,14 +16,13 @@ class confdroid_nagios::main::install (
     package { $ng_reqpackages_server:
       ensure => $ng_pkg_ensure,
     }
-  }
 
-  package { $ng_reqpackages_client:
-    ensure => $ng_pkg_ensure,
-  }
+    package { $ng_reqpackages_client:
+      ensure => $ng_pkg_ensure,
+    }
 
-  # if we want to use NRPE on clients, install it
-  if $ng_include_nrpe == true {
-    require confdroid_nrpe
+    if $ng_include_nrpe == true {
+      require confdroid_nrpe
+    }
   }
 }
diff --git a/manifests/server/nagios.pp b/manifests/server/nagios.pp
index 829a976..c72114c 100644
--- a/manifests/server/nagios.pp
+++ b/manifests/server/nagios.pp
@@ -7,7 +7,6 @@ class confdroid_nagios::server::nagios (
 
 ) inherits confdroid_nagios::params {
   if $ng_nagios_server == $fqdn {
-
     @@nagios_service { 'check_nagios_localhost':
       check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
       use                 => 'generic-service',