diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 8fecbe6aff80..02dca341cd3a 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,32 +1,44 @@
-# $NetBSD: Makefile,v 1.6 1999/03/10 14:05:40 rh Exp $
+# $NetBSD: Makefile,v 1.7 2000/02/20 06:53:59 proff Exp $
 # FreeBSD Id: Makefile,v 1.11 1998/02/01 03:04:11 itojun Exp
 #
 
-DISTNAME=		nntpcache-2.3.3
+DISTNAME=		nntpcache-2.4.0b3
 CATEGORIES=		news
-MASTER_SITES=		ftp://nntpcache.org/pub/nntpcache/ \
+MASTER_SITES=		ftp://ftp.nntpcache.org/pub/nntpcache/ \
 			ftp://ftp.fu-berlin.de/unix/news/nntpcache/ \
 			ftp://ftp.contrib.com/pub/software/unix/news/nntpcache/ \
 			ftp://ftp.eu.net/news/transport/nntpcache/ \
 			ftp://ftp.belgium.eu.net/pub/news/transport/nntpcache/ \
 			ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/news/nntpcache/ \
 			ftp://ftp.faho.rwth-aachen.de/pub/linux/nntpcache/ \
-			ftp://ftp.hway.ru/pub/news/nntpcache/ \
-			ftp://suburbia.net/pub/nntpcache/
+			ftp://ftp.hway.ru/pub/news/nntpcache/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.nntpcache.org/
 
 LICENSE=		fee-based-commercial-use
 
+# enable ldap support?
+NNTP_USE_LDAP=		no
+# enable pgp signed nocem support?
+NNTP_USE_PGP=		no
+
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=/var/spool
 CONFIGURE_ENV+=		INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 USE_GMAKE=		yes
 
-INSTALL_TARGET=		SUBDIRS="cf src filters http doc pgp contrib/newshound innreport" \
+INSTALL_TARGET=		SUBDIRS="cf src filters http doc pgp contrib/newshound innreport scripts unixauth" \
 			install
 
+.if ${NNTP_USE_LDAP} == yes
+DEPENDS+=		openldap-*:../../databases/openldap
+.endif
+
+.if ${NNTP_USE_PGP} ==	yes
+DEPENDS+=		pgp-2.*:../../security/pgp2
+.endif
+
 post-configure:
 	@${SED} -e "s:%%PREFIX%%:${PREFIX}:g"  \
 		${FILESDIR}/nntpcached.rc > ${WRKSRC}/nntpcached.sh
@@ -34,7 +46,7 @@ post-configure:
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/nntpcached.sh ${PREFIX}/etc/rc.d
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nntpcache
-	cd ${WRKSRC} && ${INSTALL_DATA} FAQ FAQ.html LICENSING \
+	cd ${WRKSRC} && ${INSTALL_DATA} README INSTALL FAQ FAQ.html LICENSING \
 		${PREFIX}/share/doc/nntpcache/
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/news/nntpcache/files/md5 b/news/nntpcache/files/md5
index 18068fa6e35f..10bc06b4fbc7 100644
--- a/news/nntpcache/files/md5
+++ b/news/nntpcache/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/02/23 00:38:05 tv Exp $
+$NetBSD: md5,v 1.4 2000/02/20 06:54:00 proff Exp $
 
-MD5 (nntpcache-2.3.3.tar.gz) = 93db846416ed88bcb39bbcea88480579
+MD5 (nntpcache-2.4.0b3.tar.gz) = f28fac698380b9a3fd5fe20db3274824
diff --git a/news/nntpcache/pkg/DESCR b/news/nntpcache/pkg/DESCR
index 3cce70ed2523..ead95a1f712f 100644
--- a/news/nntpcache/pkg/DESCR
+++ b/news/nntpcache/pkg/DESCR
@@ -13,4 +13,6 @@ without consulting the remote servers. NNTPCache can transparently
 merge multiple servers, (permiting local newsgroups with remote
 NNTP feeds), filter articles, xovers, and headers based on weighted
 regular expressions, and has built in NoCem/PGP (anti-spam) support
-(see www.nntpcache.org/www.nocem.org for details).
+(see www.nntpcache.org or www.nocem.org for details). NNTPcache
+also supports a wide variety of authentication types, including
+LDAP, /etc/{passwd,shadow}, generic unixpipe and RADIUS.
diff --git a/news/nntpcache/pkg/PLIST b/news/nntpcache/pkg/PLIST
index ffdf7165dcf4..ab7c42a700a9 100644
--- a/news/nntpcache/pkg/PLIST
+++ b/news/nntpcache/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 1999/02/23 00:38:05 tv Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/02/20 06:54:01 proff Exp $
 etc/nntpcache/VERSION
 etc/nntpcache/innreport.conf-dist
 etc/nntpcache/innreport.pl
@@ -21,6 +21,9 @@ etc/rc.d/nntpcached.sh
 sbin/innreport.sh
 sbin/newshound
 sbin/nntpcached
+libexec/unixauth
+libexec/nntpcache-gdb.sh
+libexec/nntpcache.gdb
 man/man8/newshound.8
 man/man8/nntpcached.8
 @unexec rmdir etc/nntpcache 2>/dev/null || true
@@ -29,6 +32,8 @@ man/man8/nntpcached.8
 @exec chown -R news:news /var/spool/nntpcache
 @exec chmod 700 /var/spool/nntpcache
 @unexec rm -rf /var/spool/nntpcache
+share/doc/nntpcache/INSTALL
+share/doc/nntpcache/README
 share/doc/nntpcache/FAQ
 share/doc/nntpcache/FAQ.html
 share/doc/nntpcache/LICENSING