diff --git a/ChangeLog b/ChangeLog
index 71cdd6aa153c7a..50fc8802251a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,48 @@
-2011.08.12, Version 0.5.4 (unstable)
+2011.08.26, Version 0.5.5 (unstable)
+
+* typed arrays, implementation from Plesk
+
+* fix IP multicast on SunOS
+
+* fix DNS lookup order: IPv4 first, IPv6 second (--use-uv only)
+
+* remove support for UNIX datagram sockets (--use-uv only)
+
+* UDP support for Windows (Bert Belder)
+
+* #1572 improve tab completion for objects in the REPL (Nathan Rajlich)
+
+* #1563 fix buffer overflow in child_process module (reported by Dean McNamee)
+
+* #1546 fix performance regression in http module (reported by Brian Geffon)
+
+* #1491 add PBKDF2 crypto support (Glen Low)
+
+* #1447 remove deprecated http.cat() function (Mikeal Rogers)
+
+* #1140 fix incorrect dispatch of vm.runInContext's filename argument
+  (Antranig Basman)
+
+* #1140 document vm.runInContext() and vm.createContext() (Antranig Basman)
+
+* #1428 fix os.freemem() on 64 bits freebsd (Artem Zaytsev)
+
+* #1164 make all DNS lookups async, fixes uncatchable exceptions
+  (Koichi Kobayashi)
+
+* fix incorrect ssl shutdown check (Tom Hughes)
+
+* various cmake fixes (Tom Hughes)
+
+* improved documentation (Koichi Kobayashi, Logan Smyth, Fedor Indutny,
+  Mikeal Rogers, Maciej Małecki, Antranig Basman, Mickaël Delahaye)
+
+* upgrade libuv to commit 835782a
+
+* upgrade V8 to 3.5.8
+
+
+2011.08.12, Version 0.5.4 (unstable), cfba1f59224ff8602c3fe9145181cad4c6df89a9
 
 * libuv/Windows compatibility improvements
 
diff --git a/doc/index.html b/doc/index.html
index 9f1ab403bd4bdd..97c78e2865fb26 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -27,7 +27,7 @@
         <li><a href="https://github.com/joyent/node/wiki/ChangeLog">ChangeLog</a></li>
         <li><a href="#about">About</a></li>
         <li><a href="http://nodejs.org/docs/v0.4.11/api">v0.4.11 docs</a></li>
-        <li><a href="http://nodejs.org/docs/v0.5.4/api">v0.5.4 docs</a></li>
+        <li><a href="http://nodejs.org/docs/v0.5.5/api">v0.5.5 docs</a></li>
         <br/>
         <li><a href="https://github.com/joyent/node/wiki">Wiki</a></li>
         <li><a href="http://blog.nodejs.org/">Blog</a></li>
@@ -116,11 +116,11 @@ <h2 id="download">Download</h2>
         <li><a href="http://nodejs.org/docs/v0.4.11/api/index.html">Documentation</a>
       </ul>
 
-      <p>2011.08.12 v0.5.4 (unstable)
+      <p>2011.08.12 v0.5.5 (unstable)
       <ul class="release">
-        <li><a href="http://nodejs.org/dist/v0.5.4/node-v0.5.4.tar.gz"><code>node-v0.5.4.tar.gz</code> Source code</a>
-        <li><a href="http://nodejs.org/dist/v0.5.4/node.exe"><code>node.exe</code> Windows executable</a>
-        <li><a href="http://nodejs.org/docs/v0.5.4/api/index.html">Documentation</a>
+        <li><a href="http://nodejs.org/dist/v0.5.5/node-v0.5.5.tar.gz"><code>node-v0.5.5.tar.gz</code> Source code</a>
+        <li><a href="http://nodejs.org/dist/v0.5.5/node.exe"><code>node.exe</code> Windows executable</a>
+        <li><a href="http://nodejs.org/docs/v0.5.5/api/index.html">Documentation</a>
       </ul>
 
 
diff --git a/doc/template.html b/doc/template.html
index a11b124d8e5377..b2eef289018fbe 100644
--- a/doc/template.html
+++ b/doc/template.html
@@ -2,7 +2,7 @@
 <html>
 <head>
   <meta charset="UTF-8" />
-  <title>{{section}}Node.js v0.5.4 Manual &amp; Documentation</title>
+  <title>{{section}}Node.js v0.5.5 Manual &amp; Documentation</title>
   <link type="image/x-icon" rel="icon" href="/favicon.ico" />
   <link type="image/x-icon" rel="shortcut icon" href="/favicon.ico" />
   <link rel="stylesheet" href="assets/style.css" type="text/css" media="all" />
@@ -11,7 +11,7 @@
 <body>
   <div id="container">
     <header>
-      <h1>Node.js v0.5.4 Manual &amp; Documentation</h1>
+      <h1>Node.js v0.5.5 Manual &amp; Documentation</h1>
       <div id="gtoc">
         <p><a href="index.html">Index</a> | <a href="all.html">View on single page</a></p>
       </div>
diff --git a/src/node_version.h b/src/node_version.h
index 70b1bf8ba354e4..db79e6fabff31d 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -29,7 +29,7 @@
 #define NODE_MAJOR_VERSION 0
 #define NODE_MINOR_VERSION 5
 #define NODE_PATCH_VERSION 5
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_STRINGIFY
 #define NODE_STRINGIFY(n) NODE_STRINGIFY_HELPER(n)
