diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 286df254ac6..b865421143b 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2004/05/11 14:56:32 jakob Exp $
+# $OpenBSD: Makefile,v 1.42 2004/07/18 22:19:03 jakob Exp $
 
 COMMENT=		"University of Washington IMAP4rev1/POP2/POP3 mail servers"
 COMMENT-mailutil=	"University of Washington IMAP4rev1/POP2/POP3 mail utility"
 
-VERSION=		2004.350
-DISTNAME=		imap-2004
+VERSION=		2004.352
+DISTNAME=		imap-2004a
 
 PKGNAME=		imap-uw-${VERSION}
 PKGNAME-mailutil=	mailutil-uw-${VERSION}
@@ -52,8 +52,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8c ${PREFIX}/man/man8/imapd.8
-	${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8
+	${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${PREFIX}/man/man8/imapd.8
+	${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${PREFIX}/man/man8/ipopd.8
 	${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/man/man1
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index d76254259f4..c6fdfa25f8b 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,3 +1,3 @@
-MD5 (imap-2004.tar.Z) = ec3dafeeae320457a1d098157e9bf969
-RMD160 (imap-2004.tar.Z) = 5a2c6f8e0af6488cad60aaa5b8858350eb5e6d50
-SHA1 (imap-2004.tar.Z) = f8bacc27f784b4b84b3742056b8917394f156ffa
+MD5 (imap-2004a.tar.Z) = 34d2c66271302cd2f926094fb5e8705d
+RMD160 (imap-2004a.tar.Z) = 2d688f3b45097c7d7d924f58d9de39ceb32dd4fd
+SHA1 (imap-2004a.tar.Z) = e5df251f2b8c3f01e94195a2832b5ba5cd809fbb
diff --git a/mail/imap-uw/patches/patch-imapd.8 b/mail/imap-uw/patches/patch-imapd.8
new file mode 100644
index 00000000000..419c692a9d7
--- /dev/null
+++ b/mail/imap-uw/patches/patch-imapd.8
@@ -0,0 +1,16 @@
+$OpenBSD: patch-imapd.8,v 1.1 2004/07/18 22:19:03 jakob Exp $
+
+--- src/imapd/imapd.8.orig	Tue Jul 15 02:54:11 2003
++++ src/imapd/imapd.8	Sun Oct  5 23:44:26 2003
+@@ -1,9 +1,9 @@
+-.TH IMAPD 8C "July 14, 2003"
++.TH IMAPD 8 "October 12, 1998"
+ .UC 5
+ .SH NAME
+ IMAPd \- Internet Message Access Protocol server
+ .SH SYNOPSIS
+-.B /usr/etc/imapd
++.B imapd
+ .SH DESCRIPTION
+ .I imapd
+ is a server which supports the
diff --git a/mail/imap-uw/patches/patch-imapd.8c b/mail/imap-uw/patches/patch-imapd.8c
deleted file mode 100644
index dd9a47ef756..00000000000
--- a/mail/imap-uw/patches/patch-imapd.8c
+++ /dev/null
@@ -1,30 +0,0 @@
-$OpenBSD: patch-imapd.8c,v 1.4 2003/10/05 22:00:00 jakob Exp $
-
---- src/imapd/imapd.8c.orig	Tue Jul 15 02:54:11 2003
-+++ src/imapd/imapd.8c	Sun Oct  5 23:44:26 2003
-@@ -1,9 +1,9 @@
--.TH IMAPD 8C "July 14, 2003"
-+.TH IMAPD 8 "October 12, 1998"
- .UC 5
- .SH NAME
- IMAPd \- Internet Message Access Protocol server
- .SH SYNOPSIS
--.B /usr/etc/imapd
-+.B imapd
- .SH DESCRIPTION
- .I imapd
- is a server which supports the
-@@ -25,11 +25,11 @@ file for additional information.
- .PP
- .I imapd
- can also be accessed via
--.IR rsh (1C)
-+.IR rsh (1)
- by many Unix-based clients.  To do this, the
- .I imapd
- binary must have a link to
- .I /etc/rimapd
- since this is where this software expects it to be located.
- .SH "SEE ALSO"
--rsh(1C) ipopd(8C)
-+rsh(1) ipopd(8)
diff --git a/mail/imap-uw/patches/patch-ipopd.8 b/mail/imap-uw/patches/patch-ipopd.8
new file mode 100644
index 00000000000..231df834acb
--- /dev/null
+++ b/mail/imap-uw/patches/patch-ipopd.8
@@ -0,0 +1,19 @@
+$OpenBSD: patch-ipopd.8,v 1.1 2004/07/18 22:19:03 jakob Exp $
+
+--- src/ipopd/ipopd.8.orig	Tue Jul 15 02:54:25 2003
++++ src/ipopd/ipopd.8	Sun Oct  5 23:44:26 2003
+@@ -1,11 +1,11 @@
+-.TH IPOPD 8C "July 14, 2003"
++.TH IPOPD 8 "January 16, 1992"
+ .UC 5
+ .SH NAME
+ IPOPd \- Post Office Protocol server
+ .SH SYNOPSIS
+-.B /usr/etc/ipop2d
++.B ipop2d
+ .PP
+-.B /usr/etc/ipop3d
++.B ipop3d
+ .SH DESCRIPTION
+ .I IPOP2d
+ and
diff --git a/mail/imap-uw/patches/patch-ipopd.8c b/mail/imap-uw/patches/patch-ipopd.8c
deleted file mode 100644
index 8876ce068f3..00000000000
--- a/mail/imap-uw/patches/patch-ipopd.8c
+++ /dev/null
@@ -1,28 +0,0 @@
-$OpenBSD: patch-ipopd.8c,v 1.4 2003/10/05 22:00:00 jakob Exp $
-
---- src/ipopd/ipopd.8c.orig	Tue Jul 15 02:54:25 2003
-+++ src/ipopd/ipopd.8c	Sun Oct  5 23:44:26 2003
-@@ -1,11 +1,11 @@
--.TH IPOPD 8C "July 14, 2003"
-+.TH IPOPD 8 "January 16, 1992"
- .UC 5
- .SH NAME
- IPOPd \- Post Office Protocol server
- .SH SYNOPSIS
--.B /usr/etc/ipop2d
-+.B ipop2d
- .PP
--.B /usr/etc/ipop3d
-+.B ipop3d
- .SH DESCRIPTION
- .I IPOP2d
- and
-@@ -41,7 +41,7 @@ port as indicated by the
- file (see
- .IR services (5)).
- .SH "SEE ALSO"
--imapd(8C)
-+imapd(8)
- .SH BUGS
- The
- .B POP2