diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile
index 5adf10a765b6..06becae3ea7a 100644
--- a/archivers/hpack/Makefile
+++ b/archivers/hpack/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2002/03/09 03:27:51 yyamano Exp $
+# $NetBSD: Makefile,v 1.11 2002/03/14 13:02:30 wiz Exp $
 
-DISTNAME=       hpack79${USE_RSAREF2:S/YES/u/:C/[^u]*//g}src
+DISTNAME=       hpack79src
 PKGNAME=        hpack-0.79
 CATEGORIES=	archivers
 MASTER_SITES=   ftp://src.doc.ic.ac.uk/packages/hpack/
@@ -10,8 +10,6 @@ COMMENT=	Multi-System Archiver with open keys PGP-based security
 
 CRYPTO=		yes
 WRKSRC=		${WRKDIR}
-PATCHDIR=	${WRKDIR}/.patches
-USE_RSAREF2=	NO
 
 MAKEFILE=       makefile
 ALL_TARGET=     hpack
@@ -25,30 +23,6 @@ MAKE_FLAGS=	CFLAGS="-c -DBSD386 -D__UNIX__ -DPREFIX=\\\"${PREFIX}\\\" -I. ${CFLA
 		CMDL="${LDFLAGS} -ltermcap"
 .endif
 
-.if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES
-DEPENDS+=	rsaref-2.0p3:../../security/rsaref
-LDFLAGS+=	-L${LOCALBASE}/lib -lrsaref
-CFLAGS+=	-I${LOCALBASE}/include -DRSAREF
-.endif
-
-fetch-depends:
-.if !defined(USE_RSAREF2) || ${USE_RSAREF2} != YES && ${USE_RSAREF2} != NO
-	@${ECHO}
-	@${ECHO} The variable USE_RSAREF2 must be set to either YES or NO
-	@${ECHO} in order to build this package.  USA residents that are
-	@${ECHO} not licensees of the RSA algorithm MUST set this variable
-	@${ECHO} to YES.  Users outside the USA MUST set this variable to
-	@${ECHO} NO.  Licensees may choose -- NO is faster.
-	@${FALSE}
-.endif
-
-post-extract:
-	@${MKDIR} ${PATCHDIR}
-	@${CP} ${.CURDIR}/patches/patch-* ${PATCHDIR}/
-.if defined(USE_RSAREF2) && ${USE_RSAREF2} != YES
-	@${RM} -f ${PATCHDIR}/patch-rsaref
-.endif
-
 post-build:
 	@cd ${WRKSRC}/keycvt && ${MAKE} CFLAGS="-c -D__UNIX__ ${CFLAGS}" \
 		-f ${MAKEFILE} keycvt
diff --git a/archivers/hpack/PLIST b/archivers/hpack/PLIST
index 05a6bd719aa2..5a4c6c548784 100644
--- a/archivers/hpack/PLIST
+++ b/archivers/hpack/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 20:24:30 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/14 13:02:30 wiz Exp $
 bin/hpack
 bin/keycvt
 man/man1/hpack.1
 share/doc/hpack/hpackext.doc
+@unexec cmp -s %D/etc/hpack.cfg %D/share/hpack/hpack.cfg.example && rm %D/etc/hpack.cfg || true
 share/hpack/hpack.cfg.example
 @exec if [ ! %D/etc/hpack.cfg ]; then cp -p %F %D/etc/hpack.cfg; fi
 share/hpack/language.dat