diff --git a/ChangeLog-7.php b/ChangeLog-7.php
index 37e680fda..25029f304 100644
--- a/ChangeLog-7.php
+++ b/ChangeLog-7.php
@@ -7,6 +7,97 @@ site_header("PHP 7 ChangeLog", array("current" => "docs", "css" => array("change
 
 <h1>PHP 7 ChangeLog</h1>
 
+<section class="version" id="7.0.5"><!-- {{{ 7.0.5 -->
+<h3>Version 7.0.5</h3>
+<b><?php release_date('31-Mar-2016'); ?></b>
+<ul><li>Core:
+<ul>
+  <li>Huge pages disabled by default.</li>
+  <li>Added ability to enable huge pages in Zend Memory Manager through the environment variable USE_ZEND_ALLOC_HUGE_PAGES=1.</li>
+  <li><?php bugfix(71756); ?> (Call-by-reference widens scope to uninvolved functions when used in switch).</li>
+  <li><?php bugfix(71729); ?> (Possible crash in zend_bin_strtod, zend_oct_strtod, zend_hex_strtod).</li>
+  <li><?php bugfix(71695); ?> (Global variables are reserved before execution).</li>
+  <li><?php bugfix(71629); ?> (Out-of-bounds access in php_url_decode in context php_stream_url_wrap_rfc2397).</li>
+  <li><?php bugfix(71622); ?> (Strings used in pass-as-reference cannot be used to invoke C::$callable()).</li>
+  <li><?php bugfix(71596); ?> (Segmentation fault on ZTS with date function (setlocale)).</li>
+  <li><?php bugfix(71535); ?> (Integer overflow in zend_mm_alloc_heap()).</li>
+  <li><?php bugfix(71470); ?> (Leaked 1 hashtable iterators).</li>
+  <li><?php bugfix(71575); ?> (ISO C does not allow extra &lsquo;;&rsquo; outside of a function).</li>
+  <li><?php bugfix(71724); ?> (yield from does not count EOLs).</li>
+  <li><?php bugfix(71767); ?> (ReflectionMethod::getDocComment returns the wrong comment).</li>
+  <li><?php bugfix(71806); ?> (php_strip_whitespace() fails on some numerical values).</li>
+  <li><?php bugfix(71624); ?> (`php -R` (PHP_MODE_PROCESS_STDIN) is broken).</li>
+</ul></li>
+<li>CLI Server:
+<ul>
+  <li><?php bugfix(69953); ?> (Support MKCALENDAR request method).</li>
+</ul></li>
+<li>Curl:
+<ul>
+  <li><?php bugfix(71694); ?> (Support constant CURLM_ADDED_ALREADY).</li>
+</ul></li>
+<li>Date:
+<ul>
+  <li><?php bugfix(71635); ?> (DatePeriod::getEndDate segfault).</li>
+</ul></li>
+<li>Fileinfo:
+<ul>
+  <li><?php bugfix(71527); ?> (Buffer over-write in finfo_open with malformed magic file).</li>
+</ul></li>
+<li>libxml:
+<ul>
+  <li><?php bugfix(71536); ?> (Access Violation crashes php-cgi.exe).</li>
+</ul></li>
+<li>mbstring:
+<ul>
+  <li><?php bugfix(71906); ?> (AddressSanitizer: negative-size-param (-1) in mbfl_strcut).</li>
+</ul></li>
+<li>ODBC:
+<ul>
+  <li><?php bugfix(47803); ?>, #69526 (Executing prepared statements is succesfull only for the first two statements).</li>
+</ul></li>
+<li>PCRE:
+<ul>
+  <li><?php bugfix(71659); ?> (segmentation fault in pcre running twig tests).</li>
+</ul></li>
+<li>PDO_DBlib:
+<ul>
+  <li><?php bugfix(54648); ?> (PDO::MSSQL forces format of datetime fields).</li>
+</ul></li>
+<li>Phar:
+<ul>
+  <li><?php bugfix(71625); ?> (Crash in php7.dll with bad phar filename).</li>
+  <li><?php bugfix(71317); ?> (PharData fails to open specific file).</li>
+  <li><?php bugfix(71860); ?> (Invalid memory write in phar on filename with \0 in name).</li>
+</ul></li>
+<li>phpdbg:
+<ul>
+  <li>Fixed crash when advancing (except step) inside an internal function.</li>
+</ul></li>
+<li>Session:
+<ul>
+  <li><?php bugfix(71683); ?> (Null pointer dereference in zend_hash_str_find_bucket).</li>
+</ul></li>
+<li>SNMP:
+<ul>
+  <li><?php bugfix(71704); ?> (php_snmp_error() Format String Vulnerability).</li>
+</ul></li>
+<li>SPL:
+<ul>
+  <li><?php bugfix(71617); ?> (private properties lost when unserializing ArrayObject).</li>
+</ul></li>
+<li>Standard:
+<ul>
+  <li><?php bugfix(71660); ?> (array_column behaves incorrectly after foreach by reference).</li>
+  <li><?php bugfix(71798); ?> (Integer Overflow in php_raw_url_encode).</li>
+</ul></li>
+<li>Zip:
+<ul>
+  <li>Update bundled libzip to 1.1.2.</li>
+</ul></li>
+</ul>
+<!-- }}} --></section>
+
 <section class="version" id="7.0.4"><!-- {{{ 7.0.4 -->
 <h3>Version 7.0.4</h3>
 <b><?php release_date('03-Mar-2016'); ?></b>
diff --git a/archive/archive.xml b/archive/archive.xml
index 5abde6fd6..2d9ceb3b9 100644
--- a/archive/archive.xml
+++ b/archive/archive.xml
@@ -9,6 +9,7 @@
     <uri>http://php.net/contact</uri>
     <email>php-webmaster@lists.php.net</email>
   </author>
+  <xi:include href="entries/2016-03-31-1.xml"/>
   <xi:include href="entries/2016-03-30-1.xml"/>
   <xi:include href="entries/2016-03-15-1.xml"/>
   <xi:include href="entries/2016-03-03-3.xml"/>
diff --git a/archive/entries/2016-03-31-1.xml b/archive/entries/2016-03-31-1.xml
new file mode 100644
index 000000000..69bce21aa
--- /dev/null
+++ b/archive/entries/2016-03-31-1.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<entry xmlns="http://www.w3.org/2005/Atom">
+  <title>PHP 7.0.5 Released</title>
+  <id>http://php.net/archive/2016.php#id2016-03-31-1</id>
+  <published>2016-03-31T13:00:00+01:00</published>
+  <updated>2016-03-31T13:00:00+01:00</updated>
+  <category term="releases" label="New PHP release"/>
+  <category term="frontpage" label="PHP.net frontpage news"/>
+  <link href="http://php.net/index.php#id2016-03-31-1" rel="alternate" type="text/html"/>
+  <link href="http://php.net/archive/2016.php#id2016-03-31-1" rel="via" type="text/html"/>
+  <content type="xhtml">
+    <div xmlns="http://www.w3.org/1999/xhtml">
+     <p>The PHP development team announces the immediate availability of PHP
+     7.0.5. This is a security release. Several security bugs were fixed in
+     this release. 
+     
+     All PHP 7.0 users are encouraged to upgrade to this version.
+     </p>
+     
+     <p>For source downloads of PHP 7.0.5 please visit our <a href="http://www.php.net/downloads.php">downloads page</a>,
+     Windows source and binaries can be found on <a href="http://windows.php.net/download/">windows.php.net/download/</a>.
+     The list of changes is recorded in the <a href="http://www.php.net/ChangeLog-7.php#7.0.5">ChangeLog</a>.
+     </p>
+    </div>
+  </content>
+</entry>
diff --git a/include/releases.inc b/include/releases.inc
index a50499fbf..b1e342da9 100644
--- a/include/releases.inc
+++ b/include/releases.inc
@@ -2,11 +2,47 @@
 $OLDRELEASES = array (
   7 => 
   array (
+    '7.0.4' => 
+    array (
+      'announcement' => 
+      array (
+        'English' => '/releases/7_0_4.php',
+      ),
+      'source' => 
+      array (
+        0 => 
+        array (
+          'filename' => 'php-7.0.4.tar.bz2',
+          'name' => 'PHP 7.0.4 (tar.bz2)',
+          'md5' => '0171201350941327399a5c3e678a86e5',
+          'sha256' => 'a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1b3318e181baf529dcc',
+          'date' => '03 Mar 2016',
+        ),
+        1 => 
+        array (
+          'filename' => 'php-7.0.4.tar.gz',
+          'name' => 'PHP 7.0.4 (tar.gz)',
+          'md5' => 'ce986fe03df3d1050966fdea21224040',
+          'sha256' => 'f6cdac2fd37da0ac0bbcee0187d74b3719c2f83973dfe883d5cde81c356fe0a8',
+          'date' => '03 Mar 2016',
+        ),
+        2 => 
+        array (
+          'filename' => 'php-7.0.4.tar.xz',
+          'name' => 'PHP 7.0.4 (tar.xz)',
+          'md5' => '82c60fc8167dd964119447da539af4f7',
+          'sha256' => '584e0e374e357a71b6e95175a2947d787453afc7f9ab7c55651c10491c4df532',
+          'date' => '03 Mar 2016',
+        ),
+      ),
+      'date' => '03 Mar 2016',
+      'museum' => false,
+    ),
     '7.0.3' => 
     array (
       'announcement' => 
       array (
-        'English' => '/releases/7.0.3.php',
+        'English' => '/releases/7_0_3.php',
       ),
       'source' => 
       array (
diff --git a/include/version.inc b/include/version.inc
index 866efa7fc..aa6b8de70 100644
--- a/include/version.inc
+++ b/include/version.inc
@@ -19,20 +19,20 @@
  */
 
 /* PHP 7.0 Release */
-$PHP_7_0_RC = "7.0.5RC1"; // Current RC version (e.g., '5.6.7RC1') or false
+$PHP_7_0_RC = false; // Current RC version (e.g., '5.6.7RC1') or false
 $PHP_7_0_RC_DATE = '17 Mar 2016';
 
-$PHP_7_0_VERSION         = "7.0.4";
-$PHP_7_0_DATE            = "03 Mar 2016";
+$PHP_7_0_VERSION         = "7.0.5";
+$PHP_7_0_DATE            = "31 Mar 2016";
 $PHP_7_0_MD5     = array(
-                       "tar.bz2"       => "0171201350941327399a5c3e678a86e5",
-                       "tar.gz"        => "ce986fe03df3d1050966fdea21224040",
-                       "tar.xz"        => "82c60fc8167dd964119447da539af4f7",
+                       "tar.bz2"       => "b15e6836babcbf0aa446678ee38f896b",
+                       "tar.gz"        => "c8379f3875caf95ce14266ca8212eb4e",
+                       "tar.xz"        => "dcaaf14356875b80f937cc6700c58acb",
 );
 $PHP_7_0_SHA256     = array(
-                       "tar.bz2"       => "a246c503709c189ba8e1e22ed2cb22abc27da43a997ff1b3318e181baf529dcc",
-                       "tar.gz"        => "f6cdac2fd37da0ac0bbcee0187d74b3719c2f83973dfe883d5cde81c356fe0a8",
-                       "tar.xz"        => "584e0e374e357a71b6e95175a2947d787453afc7f9ab7c55651c10491c4df532",
+                       "tar.bz2"       => "2c09af7fe64537ea795f098b9b542ead407ef83f7cdc65b3787115ccbbb51de9",
+                       "tar.gz"        => "f9d93419031b4df663fc48f03b8a833545de8776225e46637563e2be6029908d",
+                       "tar.xz"        => "c41f1a03c24119c0dd9b741cdb67880486e64349fc33527767f6dc28d3803abb",
 );
 
 /* PHP 5.6 Release */
diff --git a/releases/7_0_5.php b/releases/7_0_5.php
new file mode 100644
index 000000000..795abb93b
--- /dev/null
+++ b/releases/7_0_5.php
@@ -0,0 +1,22 @@
+<?php
+// $Id$
+$_SERVER['BASE_PAGE'] = 'releases/7_0_5.php';
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc';
+site_header("PHP 7.0.5 Release Announcement");
+?>
+
+     <h1>PHP 7.0.5 Release Announcement</h1>
+     
+     <p>The PHP development team announces the immediate availability of PHP
+     7.0.5. This is a security release. Several security bugs were fixed in
+     this release. 
+     
+     All PHP 7.0 users are encouraged to upgrade to this version.
+     </p>
+     
+     <p>For source downloads of PHP 7.0.5 please visit our <a href="http://www.php.net/downloads.php">downloads page</a>,
+     Windows source and binaries can be found on <a href="http://windows.php.net/download/">windows.php.net/download/</a>.
+     The list of changes is recorded in the <a href="http://www.php.net/ChangeLog-7.php#7.0.5">ChangeLog</a>.
+     </p>
+
+<?php site_footer(); ?>