diff --git a/manifests/client/target.pp b/manifests/client/target.pp
index bc93405..2711f24 100644
--- a/manifests/client/target.pp
+++ b/manifests/client/target.pp
@@ -6,7 +6,7 @@
 class confdroid_nagios::client::target (
 
 ) inherits confdroid_nagios::params {
-  if $ng_enable_target == true {
+  if ($ng_nagios_server != $fqdn) and ($ng_enable_target == true) {
     package { $ng_reqpackages_client:
       ensure => $ng_pkg_ensure,
     }
diff --git a/manifests/main/install.pp b/manifests/main/install.pp
index d238d8f..a04cf4a 100644
--- a/manifests/main/install.pp
+++ b/manifests/main/install.pp
@@ -16,5 +16,13 @@ class confdroid_nagios::main::install (
     package { $ng_reqpackages_server:
       ensure => $ng_pkg_ensure,
     }
+
+    package { $ng_reqpackages_client:
+      ensure => $ng_pkg_ensure,
+    }
+
+    if $ng_include_nrpe == true {
+      require confdroid_nrpe
+    }
   }
 }