diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index beae65b9852..a4832547b68 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.48 2006/07/16 19:01:12 brad Exp $
+# $OpenBSD: Makefile,v 1.49 2006/07/18 20:27:13 alek Exp $
 
 COMMENT= 	"compact IMAP/POP3 server"
 
 DISTNAME=	dovecot-1.0.rc2
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/
 
diff --git a/mail/dovecot/pkg/PLIST b/mail/dovecot/pkg/PLIST
index ff0de96e1b0..147fa091403 100644
--- a/mail/dovecot/pkg/PLIST
+++ b/mail/dovecot/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.18 2006/07/16 02:43:08 brad Exp $
+@comment $OpenBSD: PLIST,v 1.19 2006/07/18 20:27:13 alek Exp $
 @newgroup _dovecot:518
 @newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
 %%SHARED%%
@@ -50,7 +50,7 @@ share/examples/dovecot/dovecot-example.conf
 @sample ${SYSCONFDIR}/dovecot.conf
 share/examples/dovecot/dovecot-ldap.conf
 share/examples/dovecot/dovecot-openssl.cnf
-@sample ${SYSCONFDIR}/ssl/dovecot-openssl.cnf
+@sample /etc/ssl/dovecot-openssl.cnf
 @mode 700
 @sample /var/dovecot/
 @mode 750
@@ -59,6 +59,6 @@ share/examples/dovecot/dovecot-openssl.cnf
 @mode
 @group
 share/examples/dovecot/dovecot-sql.conf
-@extra ${SYSCONFDIR}/ssl/dovecotcert.pem
-@extra ${SYSCONFDIR}/ssl/private/dovecot.pem
+@extra /etc/ssl/dovecotcert.pem
+@extra /etc/ssl/private/dovecot.pem
 @extraunexec rm -rf /var/dovecot