diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index da9157da6e0..bd94dd3f2af 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,16 +1,18 @@
-# $OpenBSD: Makefile,v 1.59 2008/05/20 07:16:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.60 2008/10/15 14:29:04 ajacoutot Exp $
 
 COMMENT-server=	University of Washington IMAP4rev1/POP2/POP3 mail servers
 COMMENT-mailutil=University of Washington IMAP4rev1/POP2/POP3 mail utility
 COMMENT-c-client=University of Washington's c-client mail access routines
 
-V=		2007a1
+V=		2007b
 DISTNAME=	imap-${V}
 
 PKGNAME-server=	imap-uw-${V}
 PKGNAME-mailutil=mailutil-uw-${V}
 PKGNAME-c-client=c-client-${V}
 
+#WRKDIST=	${WRKDIR}/imap-2007b
+
 CATEGORIES=	mail
 CATEGORIES-c-client=mail devel
 
@@ -61,8 +63,6 @@ HEADERS=	c-client.h dummy.h env.h env_unix.h fdstring.h flockcyg.h \
 		rfc822.h smtp.h sslio.h tcp.h tcp_unix.h unix.h utf8.h \
 		utf8aux.h
 
-WRKDIST=	${WRKDIR}/imap-2007a
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
@@ -77,8 +77,7 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/imap-uw
-	${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/imap-uw
-	@perl -pi -e 's,!!TRUEPREFIX!!,${TRUEPREFIX},' \
+	${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD \
 		${PREFIX}/share/doc/imap-uw/README.OpenBSD
 	tar -C ${WRKSRC}/docs -cf - . | \
 		tar -C ${PREFIX}/share/doc/imap-uw -xf -
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 92235c94e1a..3a7242f8f41 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,5 +1,5 @@
-MD5 (imap-2007a1.tar.Z) = goqExk75M7/MgFuDhXandA==
-RMD160 (imap-2007a1.tar.Z) = 2siditc+V0VeNIjzIYp8DRoW3wY=
-SHA1 (imap-2007a1.tar.Z) = y2LavnKXtwhNftdg5h8nry2+3pA=
-SHA256 (imap-2007a1.tar.Z) = i6DtoxVxk2Q+s8XM1GwMqAYNcC8mDfYPiWVsuJHL7rg=
-SIZE (imap-2007a1.tar.Z) = 2781669
+MD5 (imap-2007b.tar.Z) = TVnOYwPPjvk/9RNBsc4t9w==
+RMD160 (imap-2007b.tar.Z) = jQ6IuqWcDLeNxUayKoUN7VcRfJQ=
+SHA1 (imap-2007b.tar.Z) = CLSFgzT0X/sZil0nM75O8WDd1Gc=
+SHA256 (imap-2007b.tar.Z) = sxcL71n0Fr4fcQvlgzP5sMLIsP4TcGKszU9fE6N4XNA=
+SIZE (imap-2007b.tar.Z) = 2789484
diff --git a/mail/imap-uw/files/README.OpenBSD b/mail/imap-uw/files/README.OpenBSD
index 902f7cf65ad..fc18d216adb 100644
--- a/mail/imap-uw/files/README.OpenBSD
+++ b/mail/imap-uw/files/README.OpenBSD
@@ -1,25 +1,25 @@
-$OpenBSD: README.OpenBSD,v 1.1 2007/10/31 13:53:56 ajacoutot Exp $
+$OpenBSD: README.OpenBSD,v 1.2 2008/10/15 14:29:04 ajacoutot Exp $
 
 The ipop2d, ipop3d, and imapd daemons should be invoked by your
 /etc/inetd.conf file with lines such as:
 
-  pop2    stream  tcp     nowait  root    !!TRUEPREFIX!!/libexec/ipop2d   ipop2d
-  pop2    stream  tcp6    nowait  root    !!TRUEPREFIX!!/libexec/ipop2d   ipop2d
-  pop3    stream  tcp     nowait  root    !!TRUEPREFIX!!/libexec/ipop3d   ipop3d
-  pop3    stream  tcp6    nowait  root    !!TRUEPREFIX!!/libexec/ipop3d   ipop3d
-  imap    stream  tcp     nowait  root    !!TRUEPREFIX!!/libexec/imapd    imapd
-  imap    stream  tcp6    nowait  root    !!TRUEPREFIX!!/libexec/imapd    imapd
+  pop2    stream  tcp     nowait  root    ${TRUEPREFIX}/libexec/ipop2d   ipop2d
+  pop2    stream  tcp6    nowait  root    ${TRUEPREFIX}/libexec/ipop2d   ipop2d
+  pop3    stream  tcp     nowait  root    ${TRUEPREFIX}/libexec/ipop3d   ipop3d
+  pop3    stream  tcp6    nowait  root    ${TRUEPREFIX}/libexec/ipop3d   ipop3d
+  imap    stream  tcp     nowait  root    ${TRUEPREFIX}/libexec/imapd    imapd
+  imap    stream  tcp6    nowait  root    ${TRUEPREFIX}/libexec/imapd    imapd
 
 
 To use SSL as default transport you need to add the lines below to
 /etc/inetd.conf.
 
-  pop3s   stream  tcp     nowait  root    !!TRUEPREFIX!!/libexec/ipop3d   ipop3d
-  pop3s   stream  tcp6    nowait  root    !!TRUEPREFIX!!/libexec/ipop3d   ipop3d
-  imaps   stream  tcp     nowait  root    !!TRUEPREFIX!!/libexec/imapd    imapd
-  imaps   stream  tcp6    nowait  root    !!TRUEPREFIX!!/libexec/imapd    imapd
+  pop3s   stream  tcp     nowait  root    ${TRUEPREFIX}/libexec/ipop3d   ipop3d
+  pop3s   stream  tcp6    nowait  root    ${TRUEPREFIX}/libexec/ipop3d   ipop3d
+  imaps   stream  tcp     nowait  root    ${TRUEPREFIX}/libexec/imapd    imapd
+  imaps   stream  tcp6    nowait  root    ${TRUEPREFIX}/libexec/imapd    imapd
 
-You also need to install files containing RSA certificates to
+You also need to install your certificates to
 /etc/ssl/{imapd,ipop3d}.pem and files containing the corresponding private
 keys to /etc/ssl/private/{imapd,ipop3d}.pem.  See ssl(8) for how to do this.
 
@@ -27,7 +27,7 @@ keys to /etc/ssl/private/{imapd,ipop3d}.pem.  See ssl(8) for how to do this.
 If you want to use the included mailbox lock program, you need to enable
 the setgid bit on the mlock binary, then give the "smmsp" group write
 permission on the /var/mail directory.  As root:
- chmod 2555 !!TRUEPREFIX!!/libexec/mlock
+ chmod 2555 ${TRUEPREFIX}/libexec/mlock
  chgrp smmsp /var/mail
  chmod 775 /var/mail
 
diff --git a/mail/imap-uw/patches/patch-Makefile b/mail/imap-uw/patches/patch-Makefile
index eeb6d88a7e6..f712fd61af2 100644
--- a/mail/imap-uw/patches/patch-Makefile
+++ b/mail/imap-uw/patches/patch-Makefile
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile,v 1.12 2008/01/03 10:52:25 ajacoutot Exp $
---- Makefile.orig	Thu Dec 20 23:11:10 2007
-+++ Makefile	Thu Jan  3 10:59:40 2008
-@@ -334,7 +334,7 @@ bsf:	an
+$OpenBSD: patch-Makefile,v 1.13 2008/10/15 14:29:04 ajacoutot Exp $
+--- Makefile.orig	Mon May 12 21:43:44 2008
++++ Makefile	Sat Oct 11 18:33:06 2008
+@@ -332,7 +332,7 @@ bsf:	an
  bso:	an
  	$(TOUCH) ip6
  	$(BUILD) BUILDTYPE=$@ IP=$(IP6) \
@@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.12 2008/01/03 10:52:25 ajacoutot Exp $
  
  # Info from Joel Reicher about NetBSD SSL paths.  I assume it has PAM because pam is in NetBSD sources...
  
-@@ -571,8 +571,8 @@ sslunix sslsco:
+@@ -578,8 +578,8 @@ sslunix sslsco:
  	@echo ++ SSLTYPE=$(SSLTYPE).nopwd
  	@echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  	@echo
diff --git a/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c b/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c
index 69627ce397a..3016cd99dad 100644
--- a/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c
+++ b/mail/imap-uw/patches/patch-src_osdep_unix_env_unix.c
@@ -1,8 +1,8 @@
-$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.11 2008/05/20 07:16:16 ajacoutot Exp $
+$OpenBSD: patch-src_osdep_unix_env_unix.c,v 1.12 2008/10/15 14:29:04 ajacoutot Exp $
 
---- src/osdep/unix/env_unix.c.orig	Fri Feb 15 17:26:44 2008
-+++ src/osdep/unix/env_unix.c	Sun May 18 16:23:38 2008
-@@ -957,15 +957,12 @@ char *myhomedir ()
+--- src/osdep/unix/env_unix.c.orig	Tue May 13 03:17:54 2008
++++ src/osdep/unix/env_unix.c	Sat Oct 11 18:33:06 2008
+@@ -963,15 +963,12 @@ char *myhomedir ()
  static char *mymailboxdir ()
  {
    char *home = myhomedir ();
diff --git a/mail/imap-uw/pkg/PLIST-mailutil b/mail/imap-uw/pkg/PLIST-mailutil
index 52c47fedd0b..0227f1a9bc5 100644
--- a/mail/imap-uw/pkg/PLIST-mailutil
+++ b/mail/imap-uw/pkg/PLIST-mailutil
@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST-mailutil,v 1.4 2005/04/10 18:21:27 jakob Exp $
-bin/mailutil
+@comment $OpenBSD: PLIST-mailutil,v 1.5 2008/10/15 14:29:04 ajacoutot Exp $
+@bin bin/mailutil
 @man man/man1/mailutil.1
diff --git a/mail/imap-uw/pkg/PLIST-server b/mail/imap-uw/pkg/PLIST-server
index da4d895c7be..7d89b3e1d61 100644
--- a/mail/imap-uw/pkg/PLIST-server
+++ b/mail/imap-uw/pkg/PLIST-server
@@ -1,14 +1,14 @@
-@comment $OpenBSD: PLIST-server,v 1.6 2008/05/20 07:16:16 ajacoutot Exp $
+@comment $OpenBSD: PLIST-server,v 1.7 2008/10/15 14:29:04 ajacoutot Exp $
 @conflict courier-imap-*
 @conflict courier-pop3-*
 @pkgpath ${BASE_PKGPATH}
-bin/dmail
-bin/tmail
-libexec/imapd
-libexec/ipop2d
-libexec/ipop3d
+@bin bin/dmail
+@bin bin/tmail
+@bin libexec/imapd
+@bin libexec/ipop2d
+@bin libexec/ipop3d
 @group smmsp
-libexec/mlock
+@bin libexec/mlock
 @group
 @man man/man1/dmail.1
 @man man/man1/tmail.1