diff --git a/nagios/manifests/target.pp b/nagios/manifests/target.pp
index 6567716..dde91e5 100644
--- a/nagios/manifests/target.pp
+++ b/nagios/manifests/target.pp
@@ -108,6 +108,11 @@ class nagios::target::https inherits nagios::target {
         description => "HTTPS",
     }
 
+    @@nagios::service { "${::homename}_https_certificate":
+        command     => "check_http!--ssl -C 14",
+        description => "HTTPS Certificate",
+    }
+
 }
 
 
@@ -116,10 +121,15 @@ class nagios::target::https inherits nagios::target {
 class nagios::target::imaps inherits nagios::target {
 
     @@nagios::service { "${::homename}_imaps":
-        command     => "check_imap!--ssl -p 993 -D 14",
+        command     => "check_imap!--ssl -p 993",
         description => "IMAPS",
     }
 
+    @@nagios::service { "${::homename}_imaps_certificate":
+        command     => "check_imap!--ssl -p 993 -D 14",
+        description => "IMAPS Certificate",
+    }
+
 }
 
 
@@ -176,10 +186,15 @@ class nagios::target::lpd inherits nagios::target {
 class nagios::target::pop3s inherits nagios::target {
 
     @@nagios::service { "${::homename}_pop3s":
-        command     => "check_pop!--ssl -p 995 -D 14",
+        command     => "check_pop!--ssl -p 995",
         description => "POP3s",
     }
 
+    @@nagios::service { "${::homename}_pop3s_certificate":
+        command     => "check_pop!--ssl -p 995 -D 14",
+        description => "POP3s Certificate",
+    }
+
 }