diff --git a/lib/configfiles/gentoo.inc.php b/lib/configfiles/gentoo.inc.php
index 787a362e..c41f5ff6 100644
--- a/lib/configfiles/gentoo.inc.php
+++ b/lib/configfiles/gentoo.inc.php
@@ -288,6 +288,26 @@ milter_default_action = accept" >> /etc/postfix/main.cf'
 							'/etc/init.d/proftpd restart'
 						)
 					),
+					'pureftpd' => Array(
+						'label' => 'PureFTPD',
+						'commands_1' => Array(
+							'emerge pure-ftpd'
+						),
+						'files' => Array(
+							'etc_conf.d_pure-ftpd' => '/etc/conf.d/pure-ftpd',
+							'etc_pureftpd-mysql.conf' => '/etc/pureftpd-mysql.conf'
+						),
+						'commands_2' => Array(
+							'chown root:0 /etc/conf.d/pure-ftpd',
+							'chmod 0644 /etc/conf.d/pure-ftpd',
+							'chown root:0 /etc/pureftpd-mysql.conf',
+							'chmod 0600 /etc/pureftpd-mysql.conf'
+						),
+						'restart' => Array(
+							'rc-update add pure-ftpd default',
+							'/etc/init.d/pure-ftpd restart'
+						)
+					)
 				)
 			),
 			'etc' => Array(
diff --git a/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf
index 89ebc937..1f92f664 100644
--- a/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf
+++ b/templates/misc/configfiles/debian_etch/dovecot/etc_dovecot_dovecot.conf
@@ -1,4 +1,3 @@
-base_dir = /var/run/dovecot
 protocols = imap pop3 <SSLPROTOCOLS>
 listen = *
 mail_access_groups = vmail
diff --git a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf
index 89ebc937..1f92f664 100644
--- a/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf
+++ b/templates/misc/configfiles/debian_lenny/dovecot/etc_dovecot_dovecot.conf
@@ -1,4 +1,3 @@
-base_dir = /var/run/dovecot
 protocols = imap pop3 <SSLPROTOCOLS>
 listen = *
 mail_access_groups = vmail
diff --git a/templates/misc/configfiles/gentoo/pureftpd/etc_conf.d_pure-ftpd b/templates/misc/configfiles/gentoo/pureftpd/etc_conf.d_pure-ftpd
new file mode 100644
index 00000000..2d331b19
--- /dev/null
+++ b/templates/misc/configfiles/gentoo/pureftpd/etc_conf.d_pure-ftpd
@@ -0,0 +1,23 @@
+# Config file for /etc/init.d/pure-ftpd
+# Configuration-template by Froxlor
+
+IS_CONFIGURED="yes"
+
+# Server/Port
+SERVER="-S 21"
+
+## Number of simultaneous connections in total, and per IP ##
+MAX_CONN="-c 30"
+MAX_CONN_IP="-C 10"
+
+## Start daemonized in background ##
+DAEMON="-B"
+
+## Don't allow uploads if the partition is more full then this var ##
+DISK_FULL="-k 90%"
+
+## Authentication mechanism
+AUTH="-l mysql:/etc/pureftpd-mysql.conf"
+
+## Misc. Others ##
+MISC_OTHER="-A -x -j -Z"
diff --git a/templates/misc/configfiles/gentoo/pureftpd/etc_pureftpd-mysql.conf b/templates/misc/configfiles/gentoo/pureftpd/etc_pureftpd-mysql.conf
new file mode 100644
index 00000000..3d9869f5
--- /dev/null
+++ b/templates/misc/configfiles/gentoo/pureftpd/etc_pureftpd-mysql.conf
@@ -0,0 +1,11 @@
+MYSQLServer     <SQL_HOST>
+#MYSQLPort       3306
+MYSQLSocket     /var/run/mysqld/mysqld.sock
+MYSQLUser       <SQL_UNPRIVILEGED_USER>
+MYSQLPassword   <SQL_UNPRIVILEGED_PASSWORD>
+MYSQLDatabase   <SQL_DB>
+MYSQLCrypt      Crypt
+MYSQLGetPW      SELECT password FROM ftp_users WHERE username="\L" AND login_enabled="y"
+MYSQLGetUID     SELECT uid FROM ftp_users WHERE username="\L" AND login_enabled="y"
+MYSQLGetGID     SELECT gid FROM ftp_users WHERE username="\L" AND login_enabled="y"
+MYSQLGetDir     SELECT homedir FROM ftp_users WHERE username="\L" AND login_enabled="y"
diff --git a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf
index c6051be3..be337f54 100644
--- a/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf
+++ b/templates/misc/configfiles/ubuntu_hardy/dovecot/etc_dovecot_dovecot.conf
@@ -1,4 +1,3 @@
-base_dir = /var/run/dovecot
 protocols = imap pop3 <SSLPROTOCOLS>
 listen = *
 mail_access_groups = vmail
diff --git a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf
index 3dda0e74..6d3c6d91 100644
--- a/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf
+++ b/templates/misc/configfiles/ubuntu_lucid/dovecot/etc_dovecot_conf.d_01-dovecot-postfix.conf
@@ -1,5 +1,5 @@
 # Some general options
-protocols = imap pop3 imaps pop3s managesieve
+protocols = imap pop3 <SSLPROTOCOLS> managesieve
 mail_access_groups = vmail
 ## allow Plaintext Logins from foreign IP if the Connection doesn't use TLS
 disable_plaintext_auth = no