diff --git a/usr/portage/net-mail/dovecot/dovecot-1.2.7.ebuild b/dovecot-1.2.8.ebuild
index d775801..554737b 100644
--- a/usr/portage/net-mail/dovecot/dovecot-1.2.7.ebuild
+++ b/dovecot-1.2.8.ebuild
@@ -12,7 +12,7 @@ managesieve_version="0.11.9"
 SRC_URI="http://dovecot.org/releases/${major_minor}/${P}.tar.gz
 	sieve? ( http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-sieve-${sieve_version}.tar.gz )
 	managesieve? (
-		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${PV}-managesieve-${managesieve_version}.diff.gz
+		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-1.2.7-managesieve-${managesieve_version}.diff.gz
 		http://www.rename-it.nl/dovecot/${major_minor}/dovecot-${major_minor}-managesieve-${managesieve_version}.tar.gz
 	)"
 DESCRIPTION="An IMAP and POP3 server written with security primarily in mind"
@@ -59,7 +59,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	use managesieve && epatch "${WORKDIR}"/dovecot-${PV}-managesieve-${managesieve_version}.diff
+	use managesieve && epatch "${WORKDIR}"/dovecot-1.2.7-managesieve-${managesieve_version}.diff
 }
 
 src_configure() {
@@ -143,14 +143,19 @@ src_install () {
 
 	rm -rf "${D}"/usr/share/doc/dovecot
 
-	if use doc; then
-		dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
-		dodoc doc/* || die "dodoc doc/ failed"
-		docinto wiki
-		dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
-
+	if use ssl; then
+		sed -i -e 's,^CERTDIR=.*,CERTDIR=\$SSLDIR/dovecot,' \
+			-e 's,^KEYDIR=.*,KEYDIR=\$SSLDIR/dovecot,' \
+			-e 's,^CERTFILE=.*,CERTFILE=\$CERTDIR/server.pem,' \
+			-e 's,^KEYFILE=.*,KEYFILE=\$KEYDIR/server.key,' \
+			doc/mkcert.sh || die "failed to update SSL settings in mkcert.sh"
 	fi
 
+	dodoc AUTHORS NEWS README TODO dovecot-example.conf || die "basic dodoc failed"
+	dodoc doc/* || die "dodoc doc/ failed"
+	docinto wiki
+	dodoc doc/wiki/* || die "dodoc doc/wiki/ failed"
+
 	# Create the dovecot.conf file from the dovecot-example.conf file that
 	# the dovecot folks nicely left for us....
 	local conf="${D}/etc/dovecot/dovecot.conf"
@@ -177,7 +182,7 @@ src_install () {
 
 	# Listen on ipv6 and ipv4
 	if use ipv6; then
-		sed -i -e 's/^#listen = \*/listen = \[::\]/g' "${conf}" \
+		sed -i -e 's/^#listen = \*/listen = \*, \[::\]/g' "${conf}" \
 			|| die "failed to update listen settings in dovecot.conf"
 	fi