diff --git a/security/p5-Authen-Htpasswd/Makefile b/security/p5-Authen-Htpasswd/Makefile
index 637a7d33d95..adea1fc8fe0 100644
--- a/security/p5-Authen-Htpasswd/Makefile
+++ b/security/p5-Authen-Htpasswd/Makefile
@@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2007/09/15 23:29:59 merdely Exp $
+# $OpenBSD: Makefile,v 1.8 2007/11/20 20:05:35 simon Exp $
 
 COMMENT= 	read and modify Apache .htpasswd files
 
-DISTNAME=	Authen-Htpasswd-0.15
-PKGNAME=	p5-${DISTNAME}p0
+DISTNAME=	Authen-Htpasswd-0.16
 CATEGORIES=	security
 
 MAINTAINER=	Simon Bertrang <simon@openbsd.org>
@@ -19,10 +18,9 @@ MODULES=	cpan
 RUN_DEPENDS=	::devel/p5-Class-Accessor \
 		::devel/p5-IO-LockedFile
 
-REGRESS_DEPENDS=::security/p5-Crypt-PasswdMD5
+REGRESS_DEPENDS=::security/p5-Crypt-PasswdMD5 \
+		::security/p5-Digest-SHA1
 
 MAKE_ENV=	TEST_POD=Yes
 
-CONFIGURE_STYLE=modbuild
-
 .include <bsd.port.mk>
diff --git a/security/p5-Authen-Htpasswd/distinfo b/security/p5-Authen-Htpasswd/distinfo
index 82d4a99ea25..68c12c6cf2c 100644
--- a/security/p5-Authen-Htpasswd/distinfo
+++ b/security/p5-Authen-Htpasswd/distinfo
@@ -1,5 +1,5 @@
-MD5 (Authen-Htpasswd-0.15.tar.gz) = tTZm1vmZuvcYZNeYhxhrzA==
-RMD160 (Authen-Htpasswd-0.15.tar.gz) = epk0SoVnpzc8/om0njFZaOyOWSU=
-SHA1 (Authen-Htpasswd-0.15.tar.gz) = lw3qXVZhOJ8qf3ToaVXwtcBCrdQ=
-SHA256 (Authen-Htpasswd-0.15.tar.gz) = m/c+fTH59l3TeaC6EWc8VGsGyvi1gOw55JdZ+UxCDnw=
-SIZE (Authen-Htpasswd-0.15.tar.gz) = 7603
+MD5 (Authen-Htpasswd-0.16.tar.gz) = 5f5yH1/MvGh6+FXwEEg0XA==
+RMD160 (Authen-Htpasswd-0.16.tar.gz) = NNQlqYXKudRqEJieB/uLr8rWwao=
+SHA1 (Authen-Htpasswd-0.16.tar.gz) = 2fN7j6S6e78R3RXlPc0aH4Qpjhc=
+SHA256 (Authen-Htpasswd-0.16.tar.gz) = LYV7FTYzuxb91jrD7rxKl1PYPiHlM6wy6+uxJ9LQSLg=
+SIZE (Authen-Htpasswd-0.16.tar.gz) = 7741