diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index 7e74d0ad0c64..d4380e1bb154 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -5,26 +5,24 @@
 # $FreeBSD$
 #
 
-PORTNAME=	imap-uw
-PORTVERSION=	4.8
-PORTREVISION=	1
+PORTNAME=	imap
+PORTVERSION=	2000c
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.cac.washington.edu/mail/%SUBDIR%/ \
 		http://mirror.nucba.ac.jp/mirror/imap/%SUBDIR%/ \
 		ftp://ftp.uni-halle.de/pub/mail/pine/%SUBDIR%/
 MASTER_SITE_SUBDIR=	. old
-DISTNAME=	imap-2000a
-EXTRACT_SUFX=	.tar.Z
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		imap-utils${EXTRACT_SUFX}
-ALL_TARGET=	bsf
+PKGNAMESUFFIX=	-uw
+DISTFILES=	${DISTNAME}.tar.Z \
+		imap-utils.tar.Z
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
 LIB_DEPENDS=	c-client4.8:${PORTSDIR}/mail/cclient
 
 MAN8=		ipopd.8 imapd.8
+ALL_TARGET=	bsf
 
 .include <bsd.port.pre.mk>
 
@@ -48,4 +46,7 @@ do-install:
 	${INSTALL_MAN} \
 		${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8
 
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
 .include <bsd.port.post.mk>
diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo
index 5125f070f0e0..3437048116be 100644
--- a/mail/imap-uw/distinfo
+++ b/mail/imap-uw/distinfo
@@ -1,2 +1,2 @@
-MD5 (imap-2000a.tar.Z) = d642c114b55ffe2e172b8e1bef6a1a52
+MD5 (imap-2000c.tar.Z) = 90bdc0670812234a0589286798575980
 MD5 (imap-utils.tar.Z) = a6453029f201b32e9ed761e662c47b0f
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index 44a4727a76be..93c5536d17be 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -13,7 +13,7 @@
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
--CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+-CFLAGS=-g
 +CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
  
  CAT=cat
@@ -37,7 +37,7 @@
 @@ -190,12 +199,13 @@
  
  bsf:	# FreeBSD
- 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
+ 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
 -	 SIGTYPE=psx CRXTYPE=nfs \
 +	 SIGTYPE=psx CRXTYPE=nfs CHECKPW=pam \
  	 SPOOLDIR=/var \
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index acdbce7da49e..21998e76287e 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,6 +1,6 @@
---- src/imapd/Makefile.orig	Tue Oct 24 16:54:32 2000
-+++ src/imapd/Makefile	Sun Dec 17 23:44:22 2000
-@@ -18,30 +18,25 @@
+--- src/imapd/Makefile.orig	Tue Jan  9 16:08:17 2001
++++ src/imapd/Makefile		Sun Feb  4 11:54:00 2001
+@@ -18,9 +18,9 @@
  # CPYRIGHT, included with this Distribution.
  
  
@@ -12,16 +12,18 @@
  SHELL= /bin/sh
  
  
+@@ -39,21 +39,17 @@
  # Get local definitions from c-client directory
  
  C = ../c-client
 -CCLIENTLIB = $C/c-client.a
 +#CCLIENTLIB = $C/c-client.a
  CC = `cat $C/CCTYPE`
--CFLAGS = -I$C `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
+-CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
 +CFLAGS = `cat $C/CFLAGS` -DANOFILE=\"$(ANO)\" \
  	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++
 +LDFLAGS = $(EXTRALDFLAGS) `cat $C/LDFLAGS`
  
  all:	imapd
diff --git a/mail/imap-uw/pkg-descr b/mail/imap-uw/pkg-descr
index 136328fcccce..b55455044174 100644
--- a/mail/imap-uw/pkg-descr
+++ b/mail/imap-uw/pkg-descr
@@ -1,21 +1,7 @@
 This is the IMAP4rev1 server from the University of Washington.
 Included are (almost) backwards-compatible POP2 and POP3 servers.
 
-        ipop2d           POP2 daemon
-        ipop3d           POP3 daemon
-        imapd            IMAP4rev1 daemon
+WWW: http://www.washington.edu/imap/
 
-The ipop2d, ipop3d, and imapd daemons should be invoked by your
-/etc/inetd.conf file with lines such as:
-
-pop2    stream  tcp     nowait  root    /usr/local/libexec/ipop2d   ipop2d
-pop3    stream  tcp     nowait  root    /usr/local/libexec/ipop3d   ipop3d
-imap4   stream  tcp     nowait  root    /usr/local/libexec/imapd    imapd
-
-If PAM authentication support has been compiled in you may need to add the
-following lines to /etc/pam.conf:
-
-imap	auth	required	pam_unix.so			try_first_pass
-imap	account	required	pam_unix.so			try_first_pass
-pop	auth	required	pam_unix.so			try_first_pass
-pop	account	required	pam_unix.so			try_first_pass
+-Pete
+petef@databits.net
diff --git a/mail/imap-uw/pkg-message b/mail/imap-uw/pkg-message
new file mode 100644
index 000000000000..a2687d0f55da
--- /dev/null
+++ b/mail/imap-uw/pkg-message
@@ -0,0 +1,14 @@
+The ipop2d, ipop3d, and imapd daemons should be invoked by your
+/etc/inetd.conf file with lines such as:
+
+pop2    stream  tcp     nowait  root    /usr/local/libexec/ipop2d   ipop2d
+pop3    stream  tcp     nowait  root    /usr/local/libexec/ipop3d   ipop3d
+imap4   stream  tcp     nowait  root    /usr/local/libexec/imapd    imapd
+
+If PAM authentication support has been compiled in you may need to add the
+following lines to /etc/pam.conf:
+
+imap	auth	required	pam_unix.so			try_first_pass
+imap	account	required	pam_unix.so			try_first_pass
+pop	auth	required	pam_unix.so			try_first_pass
+pop	account	required	pam_unix.so			try_first_pass