diff --git a/ChangeLog-4.php b/ChangeLog-4.php
index 7122bffff..bcf2952bc 100644
--- a/ChangeLog-4.php
+++ b/ChangeLog-4.php
@@ -11,6 +11,49 @@ function bugl($number)   { echo "<a href=\"http://bugs.php.net/$number\">#$numbe
 
 <hr />
 
+<a name="4.3.7"></a>
+<h3>Version 4.3.7</h3>
+<b>03-Jun-2004</b>
+<ul>
+<li>Upgraded bundled GD library to 2.0.23. (Ilia)</li>
+<li>Changed user error handler mechanism to relay to built-in error handler if it returns false. (Andrei)</li>
+<li>Fixed command line escaping routines for win32. (Ilia)</li>
+<li>Fixed problems with *printf() functions and '%f' formatting. (Marcus)</li>
+<li>Fixed possible crash inside pg_copy_(to|from) function if delimiter is more then 1 character long. (Ilia)</li>
+<li>Fixed crash inside cpdf_place_inline_image() when working with true-color images. (Ilia)</li>
+<li>Fixed handling of return values from stored procedures in mssql_execute() with multiple result sets returned. (Frank)</li>
+<li>Fixed logic bug in session_register() which allowed registering _SESSION and/or HTTP_SESSION_VARS. (Sara)</li>
+<li><?php bugfix(28597); ?> (xmlrpc_encode_request() incorrectly encodes chars in 200-210 range). (fernando dot nemec at folha dot com dot br, Ilia)</li>
+<li><?php bugfix(28569); ?> (informix connection id is not thread safe). (novicky at aarongroup dot cz, Ard)</li>
+<li><?php bugfix(28564); ?> (Problem building informix as a shared extension).  (roques at mti dot ag, Ilia)</li>
+<li><?php bugfix(28508); ?> (Do not make hypot() available if not supported by libc). (Ilia)</li>
+<li><?php bugfix(28506); ?> (Allow negative start angle in imagearc and imagefilledarc). (Pierre)</li>
+<li><?php bugfix(28456); ?> (Problem with enclosed / in uploaded files). (Antony)</li>
+<li><?php bugfix(28386); ?> (wordwrap() wraps lines 1 character too soon). (Ilia)</li>
+<li><?php bugfix(28374); ?> (Possible unterminated loop inside _php_pgsql_trim_message()). (Ilia)</li>
+<li><?php bugfix(28355); ?> (glob() does not return error on Linux when it does not have permission to open the directory). (Ilia)</li>
+<li><?php bugfix(28289); ?> (incorrect resolving of relative paths by glob() in windows). (Ilia)</li>
+<li><?php bugfix(28229); ?> (run-tests tripped up by spaces in names). (Marcus)</li>
+<li><?php bugfix(28228); ?> (number_format() does not allow empty decimal separator). (Ilia)</li>
+<li><?php bugfix(28196); ?> (missing error constants in cURL extension). (Ilia)</li>
+<li><?php bugfix(28187); ?> (parse_url() not handling embedded IPv6 in URLs). (Sara)</li>
+<li><?php bugfix(28175); ?> (build problem for people using FreeType 2.1.0-2.1.2). (Ilia)</li>
+<li><?php bugfix(28147); ?> (Crash with drawing anti-aliased lines). (Derick)</li>
+<li><?php bugfix(28122); ?> (dba_open db3: Permission denied). (Marcus)</li>
+<li><?php bugfix(28112); ?> (sqlite_query() crashing apache on malformed query). (Ilia, Marcus)</li>
+<li><?php bugfix(28055); ?> (timeout duration too long in feof()/pfsockopen() liveness checks). (Wez)</li>
+<li><?php bugfix(28087); ?> (Do not force mysql.trace_mode to 0 on every request). (Ilia)</li>
+<li><?php bugfix(28042); ?> (greek letters in html to entity mapping not correct). (Derick)</li>
+<li><?php bugfix(28007); ?> (compile mssql extension with old versions of FreeTDS fails). (Frank)</li>
+<li><?php bugfix(27995); ?> (imagefilltoborder() stops the fill process prematurely). (Ilia)</li>
+<li><?php bugfix(27810); ?> (don't use php's pemalloc in ext/pcre). (Joe Orton)</li>
+<li><?php bugfix(23220); ?> (SSL: fatal protocol error when talking to IIS). (Wez)</li>
+
+</ul>
+There is a <a href="release_4_3_7.php">separate announcement</a> available for this release.<br />
+
+<hr />
+
 <a name="4.3.6"></a>
 <h3>Version 4.3.6</h3>
 <b>15-Apr-2004</b>
diff --git a/downloads.php b/downloads.php
index ddebe4b2e..d1c8d876c 100644
--- a/downloads.php
+++ b/downloads.php
@@ -72,18 +72,18 @@ site_header("Downloads");
 <h2>Complete Source Code</h2>
 <ul>
  <li>
-  <?php download_link('php-4.3.6.tar.bz2','PHP 4.3.6 (tar.bz2)'); ?> - 15 April 2004<br />
-  <span class="md5sum">md5: 79cde484e31871176137eb78014657fa</span>
+  <?php download_link('php-4.3.7.tar.bz2','PHP 4.3.7 (tar.bz2)'); ?> - 02 June 2004<br />
+  <span class="md5sum">md5: 5293fdc909a306a2636e0fafcc79442c</span>
  </li>
  <li>
-  <?php download_link('php-4.3.6.tar.gz', 'PHP 4.3.6 (tar.gz)');  ?> - 15 April 2004<br />
-  <span class="md5sum">md5: 4848331288d6eaffcec0323a852d1082</span>
+  <?php download_link('php-4.3.7.tar.gz', 'PHP 4.3.7 (tar.gz)');  ?> - 02 June 2004<br />
+  <span class="md5sum">md5: 20abcab34809146cb0f766a47187a957</span>
  </li>
 </ul>
 
 <p>
  See the <a href="/ChangeLog-4.php">ChangeLog</a> for a complete list of changes,
- or the <a href="/release_4_3_6.php">release notes</a> for more information on
+ or the <a href="/release_4_3_7.php">release notes</a> for more information on
  this particular release. Daily snapshots are also available from
  <a href="http://snaps.php.net/">snaps.php.net</a> (not intended for production use!).
 </p>
@@ -96,20 +96,22 @@ site_header("Downloads");
 
 <ul>
  <li>
-  <?php download_link('php-4.3.6-Win32.zip', 'PHP 4.3.6 zip package'); ?> - 15 April 2004<br />
+  <?php download_link('php-4.3.7-Win32.zip', 'PHP 4.3.7 zip package'); ?> - 02 June 2004<br />
   (CGI binary plus server API versions for Apache, Apache2 (experimental),
   ISAPI, NSAPI, Servlet and Pi3Web. MySQL support built-in, many extensions
   included, packaged as zip)<br />
-  <span class="md5sum">md5: fc4adb16b0bbff5089efc10a02240f81</span>
+  <span class="md5sum">md5: 3362079d4d1aaaf0c146b0c376ceec4b</span>
  </li>
+<!--
  <li>
-  <?php download_link('php-4.3.6-installer.exe', 'PHP 4.3.6 installer'); ?> - 15 April 2004<br />
+  <?php download_link('php-4.3.7-installer.exe', 'PHP 4.3.7 installer'); ?> - 02 June 2004<br />
   (CGI only, MySQL support built-in, packaged as Windows installer to install
   and configure PHP, and automatically configure IIS, PWS and Xitami, with
   manual configuration for other servers. N.B. no external extensions
   included)<br />
-  <span class="md5sum">md5: 76b4ba2bfa93ce7c4df7447285c71815</span>
+  <span class="md5sum">md5: </span>
  </li>
+-->
 </ul>
 
 <hr />
diff --git a/index.php b/index.php
index 3964503f7..8e179d264 100644
--- a/index.php
+++ b/index.php
@@ -152,20 +152,23 @@ commonHeader("Hypertext Preprocessor");
 
 <?php news_image("/downloads.php", "php-version4.gif", "PHP 4"); ?>
 
-<h1>PHP 4.3.7RC1 released!</h1>
+<h1>PHP 4.3.7 released!</h1>
 <p>
- <span class="newsdate">[25-May-2004]</span>
- <a href="http://qa.php.net/">PHP 4.3.7RC1</a> has been released for testing. 
- This is the first release candidate and should have a very low number of problems 
- and/or bugs. Nevertheless, please download and test it as much as possible on 
- real-life applications to uncover any remaining issues.
+ <span class="newsdate">[02-Jun-2004]</span>
+ PHP Development Team is proud to announce the release of PHP <a href="/downloads.php">PHP 4.3.7</a>.
+ This is a maintenance release that in addition to several non-critical bug fixes, addresses an input
+ validation vulnerability in escapeshellcmd() and escapeshellarg() functions on the Windows platform.
+ Users of PHP on Windows are encouraged to upgrade to this release as soon as possible.
 </p>
+
 <p>
- List of changes can be found in the 
- <a href="http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.638&r2=1.1247.2.668">NEWS</a> file.
+ All in all this release fixes over 30 bugs that have been discovered and resolved since the 4.3.6 
+ release. For a full list of changes in PHP 4.3.7, see the <a href="/ChangeLog-4.php#4.3.7">ChangeLog</a>.
 </p>
+
 <hr />
 
+
 <?php news_image("http://www.afup.org/article.php3?id_article=242", "afup2004.jpg", "AFUP"); ?>
 <h1>Call to speaker for Paris Forum 2004</h1>
 <p>
@@ -254,24 +257,7 @@ commonHeader("Hypertext Preprocessor");
 <hr />
 
 
-<?php news_image("/downloads.php", "php-version4.gif", "PHP 4"); ?>
 
-<h1>PHP 4.3.6 released!</h1>
-<p>
- <span class="newsdate">[15-Apr-2004]</span>
- The PHP Development Team is proud to announce the release of <a href="/downloads.php">PHP 4.3.6</a>.
- This is is a bug fix release whose primary goal is to address two bugs which may 
- result in crashes in PHP builds with thread-safety enabled. All users of PHP 
- in a threaded environment (Windows) are strongly encouraged to upgrade to 
- this release.
-</p>
-
-<p>
- All in all this release fixes approximately 25 bugs that have been discovered since the 4.3.5 release.
- For a full list of changes in PHP 4.3.6, see the <a href="/ChangeLog-4.php#4.3.6">ChangeLog</a>.
-</p>
-
-<hr />
 
 <h1>Second PHP Marathon announced</h1>
 <p>
diff --git a/release_4_3_7.php b/release_4_3_7.php
new file mode 100644
index 000000000..d10b451f8
--- /dev/null
+++ b/release_4_3_7.php
@@ -0,0 +1,43 @@
+<?php
+// $Id$
+$_SERVER['BASE_PAGE'] = 'release_4_3_7.php';
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+site_header("PHP 4.3.7 Release Announcement");
+?>
+
+<h1>PHP 4.3.7 Release Announcement</h1>
+
+<p>[ <a href="/release_4_3_7_fr.php">Version Fran&ccedil;aise</a> ]</p>
+
+<p>
+ PHP Development Team is proud to announce the release of PHP <a href="/downloads.php">PHP 4.3.7</a>.
+ This is a maintenance release that in addition to several non-critical bug fixes, addresses an input
+ validation vulnerability in escapeshellcmd() and escapeshellarg() functions on the Windows platform.
+ Users of PHP on Windows are encouraged to upgrade to this release as soon as possible.
+</p>
+
+<h2>Bugfix release</h2>
+
+<p>
+ Aside from the above mentioned issues this release includes the following important fixes:
+</p>
+
+<ul>
+ <li>Synchronized bundled GD library with GD 2.0.23.</li>
+ <li>Fixed a bug that prevented compilation of GD extensions against FreeType 2.1.0-2.1.2.</li>
+ <li>Fixed thread safety issue with informix connection id.</li>
+ <li>Fixed incorrect resolving of relative paths by glob() in windows.</li>
+ <li>Fixed mapping of Greek letters to html entities.</li>
+ <li>Fixed a bug that caused an on shutdown crash when using PHP with Apache 2.0.49.</li>
+ <li>Fixed a number of crashes inside pgsql, cpdf and gd extensions.</li>
+
+ <li>All in all this release fixes over 30 bugs that have been discovered and resolved
+ since the 4.3.6 release.</li>
+</ul>
+
+<p>
+ For a full list of changes in PHP 4.3.7, see the
+ <a href="/ChangeLog-4.php#4.3.7">ChangeLog</a>.
+ </p>
+
+<?php site_footer(); ?>
diff --git a/release_4_3_7_fr.php b/release_4_3_7_fr.php
new file mode 100644
index 000000000..d00ddcdb1
--- /dev/null
+++ b/release_4_3_7_fr.php
@@ -0,0 +1,43 @@
+<?php
+// $Id$
+$_SERVER['BASE_PAGE'] = 'release_4_3_7.php';
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+site_header("PHP 4.3.7 Release Announcement");
+?>
+
+<h1>PHP 4.3.7 Release Announcement</h1>
+
+<p>[ <a href="/release_4_3_7.php">English Version</a> ]</p>
+
+<p>
+ PHP Development Team is proud to announce the release of PHP <a href="/downloads.php">PHP 4.3.7</a>.
+ This is a maintenance release that in addition to several non-critical bug fixes, addresses an input
+ validation vulnerability in escapeshellcmd() and escapeshellarg() functions on the Windows platform.
+ Users of PHP on Windows are encouraged to upgrade to this release as soon as possible.
+</p>
+
+<h2>Bugfix release</h2>
+
+<p>
+ Aside from the above mentioned issues this release includes the following important fixes:
+</p>
+
+<ul>
+ <li>Synchronized bundled GD library with GD 2.0.23.</li>
+ <li>Fixed a bug that prevented compilation of GD extensions against FreeType 2.1.0-2.1.2.</li>
+ <li>Fixed thread safety issue with informix connection id.</li>
+ <li>Fixed incorrect resolving of relative paths by glob() in windows.</li>
+ <li>Fixed mapping of Greek letters to html entities.</li>
+ <li>Fixed a bug that caused an on shutdown crash when using PHP with Apache 2.0.49.</li>
+ <li>Fixed a number of crashes inside pgsql, cpdf and gd extensions.</li>
+
+ <li>All in all this release fixes over 30 bugs that have been discovered and resolved
+ since the 4.3.6 release.</li>
+</ul>
+
+<p>
+ For a full list of changes in PHP 4.3.7, see the
+ <a href="/ChangeLog-4.php#4.3.7">ChangeLog</a>.
+ </p>
+
+<?php site_footer(); ?>
diff --git a/releases.php b/releases.php
index b2e795a49..0c34b0955 100644
--- a/releases.php
+++ b/releases.php
@@ -76,6 +76,7 @@ $SIDEBAR_DATA = '
    <option value="php-4.3.4.tar.gz">4.3.4</option>
    <option value="php-4.3.5.tar.gz">4.3.5</option>
    <option value="php-4.3.6.tar.gz">4.3.6</option>
+   <option value="php-4.3.7.tar.gz">4.3.7</option>
   </select>
  </p>
 </form>
@@ -94,6 +95,36 @@ site_header("Releases");
  they are no longer supported</em>.
 </p>
 
+<a name="4.3.6"></a>
+<h2>4.3.6</h2>
+
+<ul>
+ <li>Released: 15 April 2004</li>
+ <li>Announcement: <a href="/release_4_3_6.php">English</a>, <a href="/release_4_3_6_fr.php">French</a></li>
+ <li><a href="/ChangeLog-4.php#4.3.6">ChangeLog</a></li>
+ <li>
+  Download:
+  <ul>
+   <li>
+    <?php download_link('php-4.3.6.tar.bz2','Source (tar.bz2)'); ?><br />
+    <span class="md5sum">md5: 79cde484e31871176137eb78014657fa</span>
+   </li>
+   <li>
+    <?php download_link('php-4.3.6.tar.gz','Source (tar.gz)'); ?><br />
+    <span class="md5sum">md5: 4848331288d6eaffcec0323a852d1082</span>
+   </li>
+   <li>
+    <?php download_link('php-4.3.6-Win32.zip','Windows binary'); ?><br />
+    <span class="md5sum">md5: fc4adb16b0bbff5089efc10a02240f81</span>
+   </li>
+   <li>
+    <?php download_link('php-4.3.6-installer.exe','Windows installer'); ?><br />
+    <span class="md5sum">md5: 76b4ba2bfa93ce7c4df7447285c71815</span>
+   </li>
+  </ul>
+ </li>
+</ul>
+
 <a name="4.3.5"></a>
 <h2>4.3.5</h2>