diff --git a/www/pear-HTML-QuickForm/Makefile b/www/pear-HTML-QuickForm/Makefile
index b5e6fbb41c1..c41e366c0c9 100644
--- a/www/pear-HTML-QuickForm/Makefile
+++ b/www/pear-HTML-QuickForm/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2004/08/09 20:39:54 xsa Exp $
+# $OpenBSD: Makefile,v 1.4 2005/03/02 14:26:48 mbalmer Exp $
 
 COMMENT=	"package provides methods for HTML forms"
 
-V=		3.2.3
-DISTNAME=	HTML_QuickForm-${V}
-PKGNAME=	pear-HTML-QuickForm-${V}
+DISTNAME=	HTML_QuickForm-3.2.4pl1
+PKGNAME=	pear-${DISTNAME:S/_/-/}
 CATEGORIES=	devel www pear
 
 MASTER_SITES=	http://pear.php.net/get/
@@ -12,7 +11,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	Kevin Lo <kevlo@openbsd.org>
 
-MODULES=	www/php4/pear
+MODULES=	www/php5/pear
 
 # PHP License
 PERMIT_PACKAGE_CDROM=	Yes
@@ -20,5 +19,6 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-RUN_DEPENDS=	:pear-HTML-Common->=1.2.1:www/pear-HTML-Common
+RUN_DEPENDS=	:pear-HTML-Common2->=0.1.0:www/pear-HTML-Common2
+
 .include <bsd.port.mk>
diff --git a/www/pear-HTML-QuickForm/distinfo b/www/pear-HTML-QuickForm/distinfo
index 94c581b17de..3499aa3e81d 100644
--- a/www/pear-HTML-QuickForm/distinfo
+++ b/www/pear-HTML-QuickForm/distinfo
@@ -1,4 +1,4 @@
-MD5 (HTML_QuickForm-3.2.3.tgz) = c4aae5da3dd8de8cbbe89796f15f9e00
-RMD160 (HTML_QuickForm-3.2.3.tgz) = c8e5d06802920ed25d36d01b12b5bdd98e843b4d
-SHA1 (HTML_QuickForm-3.2.3.tgz) = c4495bdbd593a2f49b15eb5f358bfce3fe73387c
-SIZE (HTML_QuickForm-3.2.3.tgz) = 90694
+MD5 (HTML_QuickForm-3.2.4pl1.tgz) = 61ade243f1810bdec641c70d16ae314e
+RMD160 (HTML_QuickForm-3.2.4pl1.tgz) = 780719b47757a319a036431dfc41dd109ef542ef
+SHA1 (HTML_QuickForm-3.2.4pl1.tgz) = f34a94649d3001c70d9369e399a4c7448ad3ac9d
+SIZE (HTML_QuickForm-3.2.4pl1.tgz) = 93144
diff --git a/www/pear-HTML-QuickForm/pkg/PLIST b/www/pear-HTML-QuickForm/pkg/PLIST
index 6d06b48d8cf..f1fb48dff6f 100644
--- a/www/pear-HTML-QuickForm/pkg/PLIST
+++ b/www/pear-HTML-QuickForm/pkg/PLIST
@@ -1,6 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:49:52 espie Exp $
-lib/
-lib/php/
+@comment $OpenBSD: PLIST,v 1.3 2005/03/02 14:26:48 mbalmer Exp $
 pear/doc/HTML_QuickForm/
 pear/doc/HTML_QuickForm/docs/
 pear/doc/HTML_QuickForm/docs/elements.php
@@ -35,7 +33,6 @@ pear/doc/HTML_QuickForm/docs/renderers/templates/styles/green.html
 pear/doc/HTML_QuickForm/docs/rules-builtin.php
 pear/doc/HTML_QuickForm/docs/rules-custom.php
 pear/lib/.registry/html_quickform.reg
-pear/lib/HTML/
 pear/lib/HTML/QuickForm/
 pear/lib/HTML/QuickForm.php
 pear/lib/HTML/QuickForm/Renderer/