diff --git a/config/dovecot.cf b/config/dovecot.cf
new file mode 100644
index 00000000..e69de29b
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 6e8ba07b..ef045ca7 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -290,6 +290,11 @@ if [ "$ENABLE_POP3" = 1 -a "$SMTP_ONLY" != 1 ]; then
   /usr/sbin/dovecot reload
 fi
 
+if [ -f /tmp/docker-mailserver/dovecot.cf ]; then
+  cp /tmp/docker-mailserver/dovecot.cf /etc/dovecot/local.conf
+  /usr/sbin/dovecot reload
+fi
+
 # Start services related to SMTP
 /etc/init.d/spamassassin start
 /etc/init.d/clamav-daemon start