diff --git a/nagios/manifests/target.pp b/nagios/manifests/target.pp
index bce857c..f5fa5af 100644
--- a/nagios/manifests/target.pp
+++ b/nagios/manifests/target.pp
@@ -243,6 +243,23 @@ class nagios::target::pop3s inherits nagios::target {
 }
 
 
+# Configure puppet service target.
+#
+class nagios::target::puppet inherits nagios::target {
+
+    @@nagios::service { "${::homename}_puppet":
+        command     => "check_http!--ssl -p 8140 -e 'HTTP/1.1 400'",
+        description => "Puppet Master",
+    }
+
+    @@nagios::service { "${::homename}_puppet_certificate":
+        command     => "check_http!--ssl -p 8140 -C 30,14",
+        description => "Puppet Certificate",
+    }
+
+}
+
+
 # Configure SMB service target.
 #
 class nagios::target::smb inherits nagios::target {