diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html
index 2c4d4c0..37e458e 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html
@@ -105,7 +105,120 @@
 7
 8
 9
-10</pre>
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+23
+24
+25
+26
+27
+28
+29
+30
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63
+64
+65
+66
+67
+68
+69
+70
+71
+72
+73
+74
+75
+76
+77
+78
+79
+80
+81
+82
+83
+84
+85
+86
+87
+88
+89
+90
+91
+92
+93
+94
+95
+96
+97
+98
+99
+100
+101
+102
+103
+104
+105
+106
+107
+108
+109
+110
+111
+112
+113
+114
+115
+116
+117
+118
+119
+120
+121
+122
+123</pre>
       </td>
       <td>
         <pre class="code"><span class="info file"># File 'manifests/client/target.pp', line 6</span>
@@ -113,7 +226,120 @@
 class confdroid_nagios::client::target (
 
 ) inherits confdroid_nagios::params {
-  # Manage target configuration here
+  if $ng_nagios_server == $fqdn {
+    if $ng_include_nrpe == true {
+      require cd_nrpe
+
+      @@nagios_host { $fqdn:
+        ensure              =&gt; $ng_ping_ensure,
+        alias               =&gt; $fqdn,
+        address             =&gt; $fqdn,
+        use                 =&gt; &#39;linux-server&#39;,
+        target              =&gt; $ng_target_host,
+        hostgroups          =&gt; &#39;linux-servers&#39;,
+        contacts            =&gt; &#39;ops&#39;,
+        max_check_attempts  =&gt; $ng_max_check_attempts,
+        notification_period =&gt; &#39;24x7&#39;,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;0640&#39;,
+        check_command       =&gt; &quot;check_ping!${ng_ping_warn}!${ng_ping_crit}&quot;,
+        notify              =&gt; Service[$ng_nagios_service],
+      }
+
+      @@nagios_service { &quot;root_partition_${fqdn}&quot;:
+        ensure              =&gt; $ng_disk_ensure,
+        check_command       =&gt; &quot;check_nrpe!check_disk!${ng_disk_warn}!${ng_disk_crit}!/&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $fqdn,
+        contacts            =&gt; &#39;ops&#39;,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${fqdn}_root_partition&quot;,
+        servicegroups       =&gt; &#39;linux-services&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;0640&#39;,
+      }
+
+      if $ng_enable_swap_check == true {
+        @@nagios_service { &quot;Swap_Usage_${fqdn}&quot;:
+          ensure              =&gt; $ng_swap_ensure,
+          check_command       =&gt; &quot;check_nrpe!check_swap!${ng_swap_warn}!${ng_swap_crit}&quot;,
+          use                 =&gt; &#39;generic-service&#39;,
+          host_name           =&gt; $fqdn,
+          contacts            =&gt; &#39;ops&#39;,
+          notification_period =&gt; &#39;24x7&#39;,
+          service_description =&gt; &quot;${fqdn}_swap_usage&quot;,
+          servicegroups       =&gt; &#39;linux-services&#39;,
+          target              =&gt; $ng_target_service,
+          owner               =&gt; &#39;nagios&#39;,
+          group               =&gt; &#39;nagios&#39;,
+          mode                =&gt; &#39;0640&#39;,
+        }
+      }
+
+      @@nagios_service { &quot;Local_Users_${fqdn}&quot;:
+        ensure              =&gt; $ng_users_ensure,
+        check_command       =&gt; &quot;check_nrpe!check_users!${ng_users_warn}!${ng_users_crit}&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $fqdn,
+        contacts            =&gt; &#39;ops&#39;,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${fqdn}_local_users&quot;,
+        servicegroups       =&gt; &#39;linux-services&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;0640&#39;,
+      }
+
+      @@nagios_service { &quot;Total Processes_${fqdn}&quot;:
+        ensure              =&gt; $ng_procs_tot_ens,
+        check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_tot_warn}!${ng_procs_tot_crit}!${ng_procs_tot_param}&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $fqdn,
+        contacts            =&gt; &#39;ops&#39;,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${fqdn}_total_processes&quot;,
+        servicegroups       =&gt; &#39;linux-services&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;0640&#39;,
+      }
+
+      @@nagios_service { &quot;Zombie Processes_${fqdn}&quot;:
+        ensure              =&gt; $ng_procs_z_ensure,
+        check_command       =&gt; &quot;check_nrpe!check_procs!${ng_procs_z_warn}!${ng_procs_z_crit}!${ng_procs_z_param}&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $fqdn,
+        contacts            =&gt; &#39;ops&#39;,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${fqdn}_zombie_processes&quot;,
+        servicegroups       =&gt; &#39;linux-services&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;0640&#39;,
+      }
+
+      @@nagios_service { &quot;Current_Load_${fqdn}&quot;:
+        ensure              =&gt; $ng_load_ensure,
+        check_command       =&gt; &quot;check_nrpe!check_load!${ng_load_warn}!${ng_load_crit}&quot;,
+        use                 =&gt; &#39;generic-service&#39;,
+        host_name           =&gt; $fqdn,
+        contacts            =&gt; &#39;ops&#39;,
+        notification_period =&gt; &#39;24x7&#39;,
+        service_description =&gt; &quot;${fqdn}_current_load&quot;,
+        servicegroups       =&gt; &#39;linux-services&#39;,
+        target              =&gt; $ng_target_service,
+        owner               =&gt; &#39;nagios&#39;,
+        group               =&gt; &#39;nagios&#39;,
+        mode                =&gt; &#39;0640&#39;,
+      }
+    }
+  }
 }</pre>
       </td>
     </tr>