diff --git a/manifests/monitoring/target.pp b/manifests/monitoring/target.pp
index cc0613b..7717fc0 100644
--- a/manifests/monitoring/target.pp
+++ b/manifests/monitoring/target.pp
@@ -36,5 +36,22 @@ class confdroid_puppet::monitoring::target (
         contacts            => $pt_target_contacts,
       }
     }
+
+    if $fqdn == $pt_puppetdb_fqdn and $pt_use_puppetdb == true {
+      # puppetdb service
+      @@nagios_service { "check_puppetdb_${fqdn}":
+        check_command       => "check_nrpe!check_puppetdb!${pt_procs_allowed}!puppetdb",
+        use                 => 'generic-service',
+        host_name           => $fqdn,
+        notification_period => '24x7',
+        service_description => "${fqdn}_check_puppetdb",
+        target              => $pt_target_service,
+        owner               => 'nagios',
+        group               => 'nagios',
+        mode                => '0640',
+        contacts            => $pt_target_contacts,
+      }
+    }
+
   }
 }