diff --git a/www/php4/Makefile b/www/php4/Makefile
index b2ad4faa649..8562e1473ec 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2001/06/18 16:27:41 avsm Exp $
+# $OpenBSD: Makefile,v 1.43 2001/06/23 23:36:35 avsm Exp $
 
 MULTI_PACKAGES=	-pear
 SUBPACKAGE?=
@@ -9,7 +9,7 @@ COMMENT-pear=	"collection of base classes for common PHP tasks"
 # This port current only works with archs supporting dynamic loading
 ONLY_FOR_ARCHS=	i386 m68k sparc
 
-V=		4.0.5
+V=		4.0.6
 DISTNAME=	php-${V}
 PKGNAME=	php4-${V}
 FULLPKGNAME-pear= php4-pear-${V}
@@ -21,7 +21,7 @@ MAINTAINER=     Anil Madhavapeddy <avsm@openbsd.org>, Jakob Schlyter <jakob@open
 
 HOMEPAGE=	http://www.php.net/
 
-MASTER_SITES=	http://www.php.net:8000/ \
+MASTER_SITES=	http://www.php.net:8000/distributions/ \
 		http://se.php.net/distributions/ \
 		http://no.php.net/distributions/ \
 		http://uk.php.net/distributions/
@@ -44,7 +44,9 @@ CONFIGURE_ARGS+=	--with-apxs=/usr/sbin/apxs \
 			--with-openssl \
 			--with-zlib \
 			--enable-sysvsem \
-			--enable-sysvshm
+			--enable-sysvshm \
+			--enable-inline-optimization \
+			--disable-debug
 
 USE_LIBTOOL=	Yes
 
@@ -56,6 +58,7 @@ FLAVOR?=
 .if ${FLAVOR:L:Mcurl}
 CONFIGURE_ARGS+=	--with-curl
 LIB_DEPENDS+=		curl.2::net/curl
+BROKEN= 	"sorry, curl flavor is broken until net/curl is upgraded to 7.8"
 .else
 CONFIGURE_ARGS+=	--without-curl
 .endif
diff --git a/www/php4/files/md5 b/www/php4/files/md5
index 14a3cc38f3e..f212dda8b73 100644
--- a/www/php4/files/md5
+++ b/www/php4/files/md5
@@ -1,3 +1,3 @@
-MD5 (php-4.0.5.tar.gz) = 763739f64eeac7099035fd86c1d39ad2
-RMD160 (php-4.0.5.tar.gz) = dee0c2d6f0c8c0eb4004c0e611e7620db89e3e17
-SHA1 (php-4.0.5.tar.gz) = 91819cc92200b2839bfc94d55e0f14e4b0375f68
+MD5 (php-4.0.6.tar.gz) = 5f698521cf2b392cf9bfa87fc1a0fe90
+RMD160 (php-4.0.6.tar.gz) = e455b9a4d1de74cb30f657668a535a2d27b81925
+SHA1 (php-4.0.6.tar.gz) = 6544eb1085b916541af914a11074e9bb8a037a03
diff --git a/www/php4/pkg/PLIST-pear b/www/php4/pkg/PLIST-pear
index 33b3d93034e..a3d45e4d805 100644
--- a/www/php4/pkg/PLIST-pear
+++ b/www/php4/pkg/PLIST-pear
@@ -1,21 +1,25 @@
-@comment $OpenBSD: PLIST-pear,v 1.1 2001/06/12 15:07:29 avsm Exp $
+@comment $OpenBSD: PLIST-pear,v 1.2 2001/06/23 23:36:37 avsm Exp $
 lib/php/Benchmark/Iterate.php
 lib/php/Benchmark/Timer.php
 lib/php/Cache.php
 lib/php/Cache/Container.php
 lib/php/Cache/Container/db.php
+lib/php/Cache/Container/dbx.php
 lib/php/Cache/Container/file.php
 lib/php/Cache/Container/phplib.php
 lib/php/Cache/Container/shm.php
+lib/php/Cache/Error.php
 lib/php/Cache/Function.php
 lib/php/Cache/Graphics.php
 lib/php/Cache/Output.php
+lib/php/Cache/OutputCompression.php
 lib/php/Console/Getopt.php
 lib/php/Crypt/CBC.php
 lib/php/Crypt/HCEMD5.php
 lib/php/DB.php
 lib/php/DB/common.php
 lib/php/DB/ibase.php
+lib/php/DB/ifx.php
 lib/php/DB/msql.php
 lib/php/DB/mssql.php
 lib/php/DB/mysql.php
@@ -29,10 +33,14 @@ lib/php/Date/Human.php
 lib/php/File/Find.php
 lib/php/File/Passwd.php
 lib/php/File/SearchReplace.php
+lib/php/HTML/Common.php
 lib/php/HTML/Form.php
 lib/php/HTML/IT.php
 lib/php/HTML/ITX.php
+lib/php/HTML/Page.php
 lib/php/HTML/Processor.php
+lib/php/HTML/Select.php
+lib/php/HTML/Table.php
 lib/php/HTTP.php
 lib/php/HTTP/Compress.php
 lib/php/Image/Remote.php
@@ -55,11 +63,16 @@ lib/php/Net/SMTP.php
 lib/php/Net/Socket.php
 lib/php/Numbers/Roman.php
 lib/php/PEAR.php
+lib/php/PEAR/Common.php
 lib/php/PEAR/Installer.php
+lib/php/PEAR/Packager.php
+lib/php/PEAR/Uploader.php
 lib/php/Payment/Verisign.php
 lib/php/Schedule/At.php
 lib/php/XML/Parser.php
 lib/php/XML/RPC.php
+lib/php/XML/RPC/Server.php
+@dirrm lib/php/XML/RPC
 @dirrm lib/php/XML
 @dirrm lib/php/Schedule
 @dirrm lib/php/Payment
@@ -80,4 +93,3 @@ lib/php/XML/RPC.php
 @dirrm lib/php/Cache/Container
 @dirrm lib/php/Cache
 @dirrm lib/php/Benchmark
-@dirrm lib/php