diff --git a/default.nix b/default.nix
index 4de34f5..7982035 100644
--- a/default.nix
+++ b/default.nix
@@ -256,6 +256,16 @@ in
 
       '';
     };
+
+    debug = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to enable verbose logging for mailserver related services.  This
+        intended be used for development purposes only, you probably don't want
+        to enable this unless you're hacking on nixos-mailserver.
+      '';
+    };
   };
 
   imports = [
diff --git a/mail-server/dovecot.nix b/mail-server/dovecot.nix
index 9a5339c..dab35c9 100644
--- a/mail-server/dovecot.nix
+++ b/mail-server/dovecot.nix
@@ -53,7 +53,12 @@ in
 
       extraConfig = ''
         #Extra Config
-        #mail_debug = yes
+        ${lib.optionalString debug ''
+          mail_debug = yes
+          auth_debug = yes
+          verbose_ssl = yes
+        ''}
+
         mail_access_groups = ${vmailGroupName}
         ssl = required
 
diff --git a/mail-server/rmilter.nix b/mail-server/rmilter.nix
index 91a49fa..5693a9a 100644
--- a/mail-server/rmilter.nix
+++ b/mail-server/rmilter.nix
@@ -51,8 +51,8 @@ in
     };
 
     services.rmilter = {
+      inherit debug;
       enable = true;
-      #debug = true;
       postfix.enable = true;
       rspamd = {
         enable = true;