diff --git a/Dockerfile b/Dockerfile
index ad9a519..40e9838 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -65,6 +65,7 @@ RUN sed -r -i -e \
 RUN newaliases -oA/etc/mail/aliases
 
 # Dovecot configuration
+COPY ./config/dovecot/dovecot.conf /etc/dovecot/dovecot.conf
 COPY ./config/dovecot/dovecot.mail /etc/dovecot/conf.d/10-mail.conf
 COPY ./config/dovecot/dovecot.ssl /etc/dovecot/conf.d/10-ssl.conf
 COPY ./config/dovecot/dovecot.auth /etc/dovecot/conf.d/10-auth.conf
diff --git a/config/dovecot/dovecot.conf b/config/dovecot/dovecot.conf
new file mode 100644
index 0000000..a22f26c
--- /dev/null
+++ b/config/dovecot/dovecot.conf
@@ -0,0 +1 @@
+!include conf.d/*.conf
diff --git a/config/paludis/sets/mail.conf b/config/paludis/sets/mail.conf
index c657afb..be852dc 100644
--- a/config/paludis/sets/mail.conf
+++ b/config/paludis/sets/mail.conf
@@ -1,7 +1,8 @@
 * app-admin/supervisor
-* dev-python/pyzor
+* dev-perl/Net-IDN-Encode
 * dev-perl/razor
+* dev-python/pyzor
 * mail-filter/spamassassin
 * mail-mta/postfix
 * net-mail/dovecot
-* dev-perl/Net-IDN-Encode
+* net-mail/dovecot-pigeonhole