diff --git a/nagios/manifests/target.pp b/nagios/manifests/target.pp
index dde91e5..66aae74 100644
--- a/nagios/manifests/target.pp
+++ b/nagios/manifests/target.pp
@@ -219,6 +219,11 @@ class nagios::target::submission inherits nagios::target {
         description => "Submission",
     }
 
+    @@nagios::service { "${::homename}_submission_certificate":
+        command     => "check_smtp!--starttls -p 587 -D 14",
+        description => "Submission Certificate",
+    }
+
 }