diff --git a/templates/dovecot/dovecot.conf.mustache b/templates/dovecot/dovecot.conf.mustache
index a519e4a..5bec579 100644
--- a/templates/dovecot/dovecot.conf.mustache
+++ b/templates/dovecot/dovecot.conf.mustache
@@ -30,12 +30,25 @@ protocol imap {
 	ssl_cert = <{{vars.dovecot.imap_cert}}
 	ssl_key = <{{vars.dovecot.imap_key}}
 
-  # Space separated list of plugins to load (default is global mail_plugins).
-  #mail_plugins = $mail_plugins
+	# Space separated list of plugins to load (default is global mail_plugins).
+	#mail_plugins = $mail_plugins
 
-  # Maximum number of IMAP connections allowed for a user from each IP address.
-  # NOTE: The username is compared case-sensitively.
-  #mail_max_userip_connections = 10
+	# Maximum number of IMAP connections allowed for a user from each IP address.
+	# NOTE: The username is compared case-sensitively.
+	#mail_max_userip_connections = 10
+}
+
+protocol submission {
+
+	ssl_cert = <{{vars.dovecot.submission_cert}}
+	ssl_key = <{{vars.dovecot.submission_key}}
+
+	# Space separated list of plugins to load (default is global mail_plugins).
+	#mail_plugins = $mail_plugins
+
+	# Maximum number of IMAP connections allowed for a user from each IP address.
+	# NOTE: The username is compared case-sensitively.
+	#mail_max_userip_connections = 10
 }
 
 
@@ -55,5 +68,18 @@ passdb {
 }
 {{/vars.dovecot.cfg.passdbs}}
 
+
+{{#vars.dovecot.cfg.services}}
+#
+# {{comment}}
+#
+service {{@}} {
+{{{raw}}}
+}
+
+{{/vars.dovecot.cfg.services}}
+
+
+
 {{vars.dovecot.cfg.raw}}