diff --git a/www/p5-Apache-ASP/Makefile b/www/p5-Apache-ASP/Makefile
index 07f091980cb..f859491a7b1 100644
--- a/www/p5-Apache-ASP/Makefile
+++ b/www/p5-Apache-ASP/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2002/10/30 04:46:32 pvalchev Exp $
+# $OpenBSD: Makefile,v 1.5 2002/11/22 12:21:48 naddy Exp $
 
 COMMENT=	"Apache ASP support"
 
-VERSION=	2.31
+VERSION=	2.49
 DISTNAME=	Apache-ASP-${VERSION}
 PKGNAME=	p5-${DISTNAME}
 CATEGORIES=	www perl5
diff --git a/www/p5-Apache-ASP/distinfo b/www/p5-Apache-ASP/distinfo
index 95248799955..1b09a3ac9ba 100644
--- a/www/p5-Apache-ASP/distinfo
+++ b/www/p5-Apache-ASP/distinfo
@@ -1,3 +1,3 @@
-MD5 (Apache-ASP-2.31.tar.gz) = 553130f72b70e2bcdaa8789c734d7f66
-RMD160 (Apache-ASP-2.31.tar.gz) = f4b7842ab4e5a8d3ed14fcbe09e5a23db5af14eb
-SHA1 (Apache-ASP-2.31.tar.gz) = 9f3d2f01ef581e4b0b1565a1d7aaaeda5da23d94
+MD5 (Apache-ASP-2.49.tar.gz) = bb12479b9face73bea7ed9b37a99fb8a
+RMD160 (Apache-ASP-2.49.tar.gz) = d08458de0ae84a61c764127b1d1f65c0bc96e2fd
+SHA1 (Apache-ASP-2.49.tar.gz) = 5f709ddc7a206b99d6d7a87f50e09469f6441a13
diff --git a/www/p5-Apache-ASP/patches/patch-ASP_pm b/www/p5-Apache-ASP/patches/patch-ASP_pm
new file mode 100644
index 00000000000..204ac17eedb
--- /dev/null
+++ b/www/p5-Apache-ASP/patches/patch-ASP_pm
@@ -0,0 +1,12 @@
+$OpenBSD: patch-ASP_pm,v 1.1 2002/11/22 12:21:48 naddy Exp $
+--- ASP.pm.orig	Fri Nov 22 13:12:02 2002
++++ ASP.pm	Fri Nov 22 13:12:11 2002
+@@ -537,7 +537,7 @@ sub FileId {
+     my @inode_stat = ();
+     if($self->{inode_names}) {
+ 	@inode_stat = stat($file);
+-	unless($inode_stat[0] && $inode_stat[1]) {
++	unless($inode_stat[0] || $inode_stat[1]) {
+ 	    @inode_stat = ();
+ 	}
+     }
diff --git a/www/p5-Apache-ASP/pkg/PLIST b/www/p5-Apache-ASP/pkg/PLIST
index 9d65217d443..7209b4bfbc1 100644
--- a/www/p5-Apache-ASP/pkg/PLIST
+++ b/www/p5-Apache-ASP/pkg/PLIST
@@ -1,8 +1,31 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/16 19:25:06 espie Exp $
-libdata/perl5/site_perl/Apache/ASP.pm
-libdata/perl5/site_perl/Bundle/Apache/ASP.pm
-libdata/perl5/site_perl/Bundle/Apache/ASP/Extra.pm
+@comment $OpenBSD: PLIST,v 1.3 2002/11/22 12:21:48 naddy Exp $
+bin/asp-perl
+${P5SITE}/Apache/ASP.pm
+${P5SITE}/Apache/ASP/Application.pm
+${P5SITE}/Apache/ASP/CGI.pm
+${P5SITE}/Apache/ASP/CGI/Test.pm
+${P5SITE}/Apache/ASP/Collection.pm
+${P5SITE}/Apache/ASP/CollectionItem.pm
+${P5SITE}/Apache/ASP/Date.pm
+${P5SITE}/Apache/ASP/Error.pm
+${P5SITE}/Apache/ASP/GlobalASA.pm
+${P5SITE}/Apache/ASP/Lang/PerlScript.pm
+${P5SITE}/Apache/ASP/Load.pm
+${P5SITE}/Apache/ASP/Request.pm
+${P5SITE}/Apache/ASP/Response.pm
+${P5SITE}/Apache/ASP/STDERR.pm
+${P5SITE}/Apache/ASP/Server.pm
+${P5SITE}/Apache/ASP/Session.pm
+${P5SITE}/Apache/ASP/Share/CORE.pm
+${P5SITE}/Apache/ASP/Share/CORE/MailErrors.inc
+${P5SITE}/Apache/ASP/Share/CORE/MailErrorsHTML.inc
+${P5SITE}/Apache/ASP/StatINC.pm
+${P5SITE}/Apache/ASP/State.pm
+${P5SITE}/Apache/ASP/StateManager.pm
+man/man1/asp-perl.1
 man/man3p/Apache::ASP.3p
-man/man3p/Bundle::Apache::ASP.3p
-man/man3p/Bundle::Apache::ASP::Extra.3p
-@dirrm libdata/perl5/site_perl/Bundle/Apache/ASP
+@dirrm ${P5SITE}/Apache/ASP/Share/CORE
+@dirrm ${P5SITE}/Apache/ASP/Share
+@dirrm ${P5SITE}/Apache/ASP/Lang
+@dirrm ${P5SITE}/Apache/ASP/CGI
+@dirrm ${P5SITE}/Apache/ASP