diff --git a/config/dovecot.cf b/config/dovecot.cf
new file mode 100644
index 00000000..f1358884
--- /dev/null
+++ b/config/dovecot.cf
@@ -0,0 +1,4 @@
+# File for additional dovecot configurations.
+# For more informations read http://wiki.dovecot.org/BasicConfiguration
+
+#mail_max_userip_connections = 50
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
diff --git a/test/config/dovecot.cf b/test/config/dovecot.cf
new file mode 100644
index 00000000..35279f28
--- /dev/null
+++ b/test/config/dovecot.cf
@@ -0,0 +1 @@
+mail_max_userip_connections = 69
diff --git a/test/tests.bats b/test/tests.bats
index b4a2d44e..a8e954af 100644
--- a/test/tests.bats
+++ b/test/tests.bats
@@ -222,6 +222,18 @@
   [ "$status" -eq 0 ]
 }
 
+#
+# dovecot
+#
+
+@test "checking dovecot: config additions" {
+  run docker exec mail grep -q 'mail_max_userip_connections = 69' /tmp/docker-mailserver/dovecot.cf
+  [ "$status" -eq 0 ]
+  run docker exec mail /bin/sh -c "doveconf | grep 'mail_max_userip_connections = 69'"
+  [ "$status" -eq 0 ]
+  [ "$output" = 'mail_max_userip_connections = 69' ]
+}
+
 #
 # spamassassin
 #
@@ -266,25 +278,25 @@
     -v "$(pwd)/test/config/empty/":/tmp/docker-mailserver/ \
     -v "$(pwd)/test/config/postfix-accounts.cf":/tmp/docker-mailserver/postfix-accounts.cf \
     -v "$(pwd)/test/config/postfix-virtual.cf":/tmp/docker-mailserver/postfix-virtual.cf \
-    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'generate-dkim-config | wc -l' 
+    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'generate-dkim-config | wc -l'
   [ "$status" -eq 0 ]
   [ "$output" -eq 5 ]
   # Check keys for localhost.localdomain
   run docker run --rm \
     -v "$(pwd)/test/config/empty/opendkim":/etc/opendkim \
-    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'ls -1 /etc/opendkim/keys/localhost.localdomain/ | wc -l' 
+    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'ls -1 /etc/opendkim/keys/localhost.localdomain/ | wc -l'
   [ "$status" -eq 0 ]
   [ "$output" -eq 2 ]
   # Check keys for otherdomain.tld
   run docker run --rm \
     -v "$(pwd)/test/config/empty/opendkim":/etc/opendkim \
-    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'ls -1 /etc/opendkim/keys/otherdomain.tld | wc -l' 
+    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c 'ls -1 /etc/opendkim/keys/otherdomain.tld | wc -l'
   [ "$status" -eq 0 ]
   [ "$output" -eq 2 ]
   # Check presence of tables and TrustedHosts
   run docker run --rm \
     -v "$(pwd)/test/config/empty/opendkim":/etc/opendkim \
-    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c "ls -1 etc/opendkim | grep -E 'KeyTable|SigningTable|TrustedHosts|keys'|wc -l" 
+    `docker inspect --format '{{ .Config.Image }}' mail` /bin/sh -c "ls -1 etc/opendkim | grep -E 'KeyTable|SigningTable|TrustedHosts|keys'|wc -l"
   [ "$status" -eq 0 ]
   [ "$output" -eq 4 ]
 }