diff --git a/www/php4/Makefile.inc b/www/php4/Makefile.inc
index 6604af523ad..b5b74af89fd 100644
--- a/www/php4/Makefile.inc
+++ b/www/php4/Makefile.inc
@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile.inc,v 1.18 2004/02/29 00:08:07 avsm Exp $
+# $OpenBSD: Makefile.inc,v 1.19 2004/04/08 12:38:59 avsm Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
-V=		4.3.5RC3
+V=		4.3.5
 DISTNAME=	php-${V}
 CATEGORIES=	www lang
 
 MAINTAINER=     Anil Madhavapeddy <avsm@openbsd.org>
 HOMEPAGE=	http://www.php.net/
 
-MASTER_SITES=	http://downloads.php.net/ilia/ \
-		http://us2.php.net/distributions/ \
+MASTER_SITES=	http://us2.php.net/distributions/ \
 		http://se.php.net/distributions/ \
 		http://no.php.net/distributions/ \
 		http://uk.php.net/distributions/
diff --git a/www/php4/core/distinfo b/www/php4/core/distinfo
index 18fea3c63c9..0b5fa4342f7 100644
--- a/www/php4/core/distinfo
+++ b/www/php4/core/distinfo
@@ -1,3 +1,3 @@
-MD5 (php-4.3.5RC3.tar.gz) = 0004b2f84938eb834002828f1f74bb08
-RMD160 (php-4.3.5RC3.tar.gz) = 456ba6d3952a092549a75ee02b3a1a2a409951ce
-SHA1 (php-4.3.5RC3.tar.gz) = 72af9bac193823acbc2a08da0fea6b18a83eb29a
+MD5 (php-4.3.5.tar.gz) = da564d33f6fb2b8174a318b154c07c79
+RMD160 (php-4.3.5.tar.gz) = 5487c18b4d35845f4e166ecf19f65ef3ad85a47d
+SHA1 (php-4.3.5.tar.gz) = 27d390f8d296e9a123500cac92f34099275585d7
diff --git a/www/php4/core/patches/patch-pear_PEAR_Downloader_php b/www/php4/core/patches/patch-pear_PEAR_Downloader_php
deleted file mode 100644
index 7a8f8f15188..00000000000
--- a/www/php4/core/patches/patch-pear_PEAR_Downloader_php
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-pear_PEAR_Downloader_php,v 1.1 2004/02/29 00:08:07 avsm Exp $
---- pear/PEAR/Downloader.php.orig	2004-02-28 17:56:58.000000000 +0000
-+++ pear/PEAR/Downloader.php	2004-02-28 17:58:04.000000000 +0000
-@@ -613,6 +613,20 @@ class PEAR_Downloader extends PEAR_Commo
-     }
- 
-     // }}}
-+    // {{{ _prependPath($path, $prepend)
-+
-+    function _prependPath($path, $prepend)
-+    {
-+        if (strlen($prepend) > 0) {
-+            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
-+                $path = $prepend . substr($path, 2);
-+            } else {
-+                $path = $prepend . $path;
-+            }
-+        }
-+        return $path;
-+    }
-+    // }}}
-     // {{{ pushError($errmsg, $code)
-     
-     /**
diff --git a/www/php4/core/patches/patch-pear_PEAR_Installer_php b/www/php4/core/patches/patch-pear_PEAR_Installer_php
deleted file mode 100644
index a4b06462438..00000000000
--- a/www/php4/core/patches/patch-pear_PEAR_Installer_php
+++ /dev/null
@@ -1,25 +0,0 @@
-$OpenBSD: patch-pear_PEAR_Installer_php,v 1.3 2004/02/29 00:08:07 avsm Exp $
---- pear/PEAR/Installer.php.orig	2004-02-28 17:56:50.000000000 +0000
-+++ pear/PEAR/Installer.php	2004-02-28 17:57:30.000000000 +0000
-@@ -540,21 +540,6 @@ class PEAR_Installer extends PEAR_Downlo
-     }
- 
-     // }}}
--    // {{{ _prependPath($path, $prepend)
--
--    function _prependPath($path, $prepend)
--    {
--        if (strlen($prepend) > 0) {
--            if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) {
--                $path = $prepend . substr($path, 2);
--            } else {
--                $path = $prepend . $path;
--            }
--        }
--        return $path;
--    }
--
--    // }}}
-     // {{{ download()
- 
-     /**
diff --git a/www/php4/core/pkg/PLIST-pear b/www/php4/core/pkg/PLIST-pear
index 5c277a849dd..273c013d3e7 100644
--- a/www/php4/core/pkg/PLIST-pear
+++ b/www/php4/core/pkg/PLIST-pear
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST-pear,v 1.6 2004/04/08 12:38:59 avsm Exp $
 pear/lib/.registry/archive_tar.reg
 pear/lib/.registry/console_getopt.reg
 pear/lib/.registry/pear.reg
@@ -8,8 +9,6 @@ pear/lib/.registry/net_smtp.reg
 pear/lib/.registry/net_socket.reg
 pear/lib/.registry/xml_parser.reg
 pear/lib/.registry/xml_rpc.reg
-pear/lib/.lock
-pear/lib/.filemap
 pear/lib/Archive/Tar.php
 pear/lib/Console/Getopt.php
 pear/lib/System.php
@@ -49,7 +48,7 @@ pear/lib/DB/ifx.php
 pear/lib/DB/msql.php
 pear/lib/DB/mssql.php
 pear/lib/DB/mysql.php
-pear/lib/DB/mysql4.php
+pear/lib/DB/mysqli.php
 pear/lib/DB/oci8.php
 pear/lib/DB/odbc.php
 pear/lib/DB/pgsql.php
@@ -83,10 +82,11 @@ pear/tests/DB/tests/limit.inc
 pear/tests/DB/tests/numcols.inc
 pear/tests/DB/tests/numrows.inc
 pear/tests/DB/tests/prepexe.inc
+pear/tests/DB/tests/run.cvs
 pear/tests/DB/tests/sequences.inc
 pear/tests/DB/tests/simplequery.inc
-pear/tests/DB/tests/tableinfo.inc
 pear/tests/DB/tests/transactions.inc
+pear/tests/DB/tests/skipif.inc
 pear/tests/DB/tests/driver/02fetch.phpt
 pear/tests/DB/tests/driver/03simplequery.phpt
 pear/tests/DB/tests/driver/04numcols.phpt
@@ -95,6 +95,7 @@ pear/tests/DB/tests/driver/06prepexec.phpt
 pear/tests/DB/tests/driver/08affectedrows.phpt
 pear/tests/DB/tests/driver/09numrows.phpt
 pear/tests/DB/tests/driver/10errormap.phpt
+pear/tests/DB/tests/driver/11transactions.phpt
 pear/tests/DB/tests/driver/13limit.phpt
 pear/tests/DB/tests/driver/14fetchmode_object.phpt
 pear/tests/DB/tests/driver/15quote.phpt
@@ -104,7 +105,8 @@ pear/tests/DB/tests/driver/18get.phpt
 pear/tests/DB/tests/driver/bug22328.phpt
 pear/tests/DB/tests/driver/connect.inc
 pear/tests/DB/tests/driver/mktable.inc
-pear/tests/DB/tests/driver/setup.inc
+pear/tests/DB/tests/driver/run.cvs
+pear/tests/DB/tests/driver/setup.inc.cvs
 pear/tests/DB/tests/driver/skipif.inc
 pear/tests/DB/tests/driver/01connect.phpt
 pear/tests/DB/tests/db_error.phpt
diff --git a/www/php4/extensions/distinfo b/www/php4/extensions/distinfo
index 18fea3c63c9..0b5fa4342f7 100644
--- a/www/php4/extensions/distinfo
+++ b/www/php4/extensions/distinfo
@@ -1,3 +1,3 @@
-MD5 (php-4.3.5RC3.tar.gz) = 0004b2f84938eb834002828f1f74bb08
-RMD160 (php-4.3.5RC3.tar.gz) = 456ba6d3952a092549a75ee02b3a1a2a409951ce
-SHA1 (php-4.3.5RC3.tar.gz) = 72af9bac193823acbc2a08da0fea6b18a83eb29a
+MD5 (php-4.3.5.tar.gz) = da564d33f6fb2b8174a318b154c07c79
+RMD160 (php-4.3.5.tar.gz) = 5487c18b4d35845f4e166ecf19f65ef3ad85a47d
+SHA1 (php-4.3.5.tar.gz) = 27d390f8d296e9a123500cac92f34099275585d7