diff --git a/maddy.conf b/maddy.conf
index f82ae365..558888d3 100644
--- a/maddy.conf
+++ b/maddy.conf
@@ -1,4 +1,4 @@
-## maddy 0.3 - default configuration file (2020-05-31)
+## Maddy Mail Server - default configuration file (2020-10-11)
 # Suitable for small-scale deployments. Uses its own format for local users DB,
 # should be managed via maddyctl utility.
 #
@@ -56,14 +56,6 @@ storage.imapsql local_mailboxes {
 hostname $(hostname)
 
 msgpipeline local_routing {
-    dmarc yes
-    check {
-        require_matching_ehlo
-        require_mx_record
-        dkim
-        spf
-    }
-
     # Insert handling for special-purpose local domains here.
     # e.g.
     # destination lists.example.org {
@@ -91,6 +83,13 @@ smtp tcp://0.0.0.0:25 {
         all concurrency 10
     }
 
+    dmarc yes
+    check {
+        require_mx_record
+        dkim
+        spf
+    }
+
     source $(local_domains) {
         reject 501 5.1.8 "Use Submission for outgoing SMTP"
     }