diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php
index b85e04e5..237040c9 100644
--- a/lib/configfiles/gentoo.inc.php
+++ b/lib/configfiles/gentoo.inc.php
@@ -303,11 +303,12 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
 					'dovecot' => Array(
 						'label' => 'Dovecot 1',
 						'commands_1' => Array(
+							'echo "net-mail/dovecot mysql" >> /etc/portage/package.use',
 							'emerge -av dovecot',
-							'mv dovecot.conf dovecot.conf.gentoo',
-							'mv dovecot-sql.conf dovecot-sql.conf.gentoo',
-							'touch dovecot.conf',
-							'touch dovecot-sql.conf',
+							'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo',
+							'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo',
+							'touch /etc/dovecot/dovecot.conf',
+							'touch /etc/dovecot/dovecot-sql.conf',
 						),
 						'files' => Array(
 							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
@@ -324,11 +325,12 @@ milter_default_action = accept" >> /etc/postfix/main.cf',
 					'dovecot2' => Array(
 						'label' => 'Dovecot 2',
 						'commands_1' => Array(
+							'echo "net-mail/dovecot mysql" >> /etc/portage/package.use',
 							'emerge -av dovecot',
-							'mv dovecot.conf dovecot.conf.gentoo',
-							'mv dovecot-sql.conf dovecot-sql.conf.gentoo',
-							'touch dovecot.conf',
-							'touch dovecot-sql.conf',
+							'mv /etc/dovecot/dovecot.conf /etc/dovecot/dovecot.conf.gentoo',
+							'mv /etc/dovecot/dovecot-sql.conf /etc/dovecot/dovecot-sql.conf.gentoo',
+							'touch /etc/dovecot/dovecot.conf',
+							'touch /etc/dovecot/dovecot-sql.conf',
 						),
 						'files' => Array(
 							'etc_dovecot_dovecot.conf' => '/etc/dovecot/dovecot.conf',
diff --git a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf
index b7ab0f9d..971b2628 100644
--- a/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf
+++ b/templates/misc/configfiles/gentoo/dovecot2/etc_dovecot_dovecot.conf
@@ -8,7 +8,9 @@ mail_debug = no
 protocols = imap pop3
 
 ### SSL Settings
-### After setting this options, set disable_plaintext_auth to yes (see above)
+### After you obtained an SSL-certificate enable ssl here and 
+### set disable_plaintext_auth to yes (see above)
+ssl = no
 #ssl_cert = </etc/ssl/server/<SERVERNAME>.pem
 #ssl_key = </etc/ssl/server/<SERVERNAME>.key