diff --git a/target/postfix/master.cf b/target/postfix/master.cf
index fdc95f69..747a8bef 100644
--- a/target/postfix/master.cf
+++ b/target/postfix/master.cf
@@ -82,13 +82,16 @@ policyd-spf  unix  -       n       n       -       0       spawn
 #
 
 smtp-amavis     unix    -       -       n       -       2       smtp
+  -o syslog_name=postfix/$service_name
   -o smtp_data_done_timeout=1200
   -o smtp_send_xforward_command=yes
   -o disable_dns_lookups=yes
   -o max_use=20
   -o smtp_tls_security_level=none
+  -o smtp_tls_wrappermode=no
 
 127.0.0.1:10025 inet    n       -       n       -       -       smtpd
+  -o syslog_name=postfix/smtpd-amavis
   -o content_filter=
   -o local_recipient_maps=
   -o relay_recipient_maps=