diff --git a/www/Makefile b/www/Makefile
index 33bddf81d1e8..5297e4b01ff2 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.176 2002/02/05 20:44:02 drochner Exp $
+# $NetBSD: Makefile,v 1.177 2002/02/05 21:07:23 drochner Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -19,10 +19,10 @@ SUBDIR+=	ap-dtcl
 SUBDIR+=	ap-fastcgi
 SUBDIR+=	ap-jk
 SUBDIR+=	ap-jserv
-SUBDIR+=	ap-mod_python
 SUBDIR+=	ap-perl
 SUBDIR+=	ap-php3
 SUBDIR+=	ap-php4
+SUBDIR+=	ap-python
 SUBDIR+=	ap-ruby
 SUBDIR+=	ap-ssl
 SUBDIR+=	ap-xslt
diff --git a/www/ap-mod_python/DESCR b/www/ap-python/DESCR
similarity index 100%
rename from www/ap-mod_python/DESCR
rename to www/ap-python/DESCR
diff --git a/www/ap-mod_python/Makefile b/www/ap-python/Makefile
similarity index 91%
rename from www/ap-mod_python/Makefile
rename to www/ap-python/Makefile
index b3dc10a8ddb1..b7e7f15fb2e8 100644
--- a/www/ap-mod_python/Makefile
+++ b/www/ap-python/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/02/05 20:43:08 drochner Exp $
+# $NetBSD: Makefile,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
 #
 
 DISTNAME=		mod_python-2.7.6
-PKGNAME=		ap-mod_python-2.7.6
+PKGNAME=		ap-python-2.7.6
 CATEGORIES=		www
 MASTER_SITES=		http://www.modpython.org/dist/
 EXTRACT_SUFX=           .tgz
diff --git a/www/ap-mod_python/distinfo b/www/ap-python/distinfo
similarity index 84%
rename from www/ap-mod_python/distinfo
rename to www/ap-python/distinfo
index 415acdedac97..ad07dad9aaf3 100644
--- a/www/ap-mod_python/distinfo
+++ b/www/ap-python/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/02/05 20:43:08 drochner Exp $
+$NetBSD: distinfo,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
 
 SHA1 (mod_python-2.7.6.tgz) = 37579015f2c2bf0c6106e8d301b8a09254221b54
 Size (mod_python-2.7.6.tgz) = 176449 bytes
diff --git a/www/ap-mod_python/patches/patch-aa b/www/ap-python/patches/patch-aa
similarity index 78%
rename from www/ap-mod_python/patches/patch-aa
rename to www/ap-python/patches/patch-aa
index 6f521d505928..4b85c0846a0a 100644
--- a/www/ap-mod_python/patches/patch-aa
+++ b/www/ap-python/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/02/05 20:43:08 drochner Exp $
+$NetBSD: patch-aa,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
 --- src/Makefile.in.orig	Sat Nov 10 05:38:09 2001
 +++ src/Makefile.in	Sat Nov 10 05:38:39 2001
 @@ -53,7 +53,7 @@
diff --git a/www/ap-mod_python/patches/patch-ab b/www/ap-python/patches/patch-ab
similarity index 97%
rename from www/ap-mod_python/patches/patch-ab
rename to www/ap-python/patches/patch-ab
index 6ab2a0820b09..ad8ffee972c5 100644
--- a/www/ap-mod_python/patches/patch-ab
+++ b/www/ap-python/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/02/05 20:43:08 drochner Exp $
+$NetBSD: patch-ab,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
 --- src/tableobject.c.orig	Mon May 28 23:00:41 2001
 +++ src/tableobject.c	Sun Nov  4 18:28:55 2001
 @@ -185,6 +185,105 @@
diff --git a/www/ap-mod_python/patches/patch-ac b/www/ap-python/patches/patch-ac
similarity index 89%
rename from www/ap-mod_python/patches/patch-ac
rename to www/ap-python/patches/patch-ac
index f73549f67479..a0c037111db7 100644
--- a/www/ap-mod_python/patches/patch-ac
+++ b/www/ap-python/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/02/05 20:43:08 drochner Exp $
+$NetBSD: patch-ac,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
 --- src/mod_python.c.orig	Sat Nov 10 13:06:57 2001
 +++ src/mod_python.c	Sat Nov 10 13:07:53 2001
 @@ -474,11 +474,13 @@
diff --git a/www/ap-mod_python/patches/patch-ad b/www/ap-python/patches/patch-ad
similarity index 87%
rename from www/ap-mod_python/patches/patch-ad
rename to www/ap-python/patches/patch-ad
index 968feb9e467e..559a4ff7b678 100644
--- a/www/ap-mod_python/patches/patch-ad
+++ b/www/ap-python/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/02/05 20:43:08 drochner Exp $
+$NetBSD: patch-ad,v 1.1.1.1 2002/02/05 21:05:58 drochner Exp $
 
 --- Makefile.in.orig	Wed Dec  6 04:05:37 2000
 +++ Makefile.in	Tue Feb  5 21:30:44 2002