diff --git a/ChangeLog b/ChangeLog
index b6d7a2804a..a42f011620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,29 @@
-2009.11.07, Version 0.1.17
+2009.11.17, Version 0.1.18
+
+  * Feature: process.watchFile() process.unwatchFile()
+
+  * Feature: "uncaughtException" event on process
+    (Felix Geisendörfer)
+
+  * Feature: 'drain' event to tcp.Connection
+
+  * Bugfix: Promise.timeout() blocked the event loop
+    (Felix Geisendörfer)
+
+  * Bugfix: sendBody() and chunked utf8 strings
+    (Felix Geisendörfer)
+
+  * Supply the strerror as a second arg to the tcp.Connection close
+    event (Johan Sørensen)
+
+  * Add EventEmitter.removeListener (frodenius@gmail.com)
+
+  * Format JSON for inspecting objects (Felix Geisendörfer)
+
+  * Upgrade libev to latest CVS
+
+
+2009.11.07, Version 0.1.17, d1f69ef35dac810530df8249d523add168e09f03
 
   * Feature: process.chdir() (Brandon Beacher)
 
@@ -22,9 +47,9 @@
     - Move node.fs into module "posix"
     - process is no longer the global object. GLOBAL is.
 
-	For more information on the API changes see: 
-		http://thread.gmane.org/gmane.comp.lang.javascript.nodejs/6
-		http://thread.gmane.org/gmane.comp.lang.javascript.nodejs/14
+  For more information on the API changes see: 
+    http://thread.gmane.org/gmane.comp.lang.javascript.nodejs/6
+    http://thread.gmane.org/gmane.comp.lang.javascript.nodejs/14
 
   * Feature: process.platform, process.memoryUsage()
 
diff --git a/doc/api.txt b/doc/api.txt
index 2801452636..aa6949b87a 100644
--- a/doc/api.txt
+++ b/doc/api.txt
@@ -1,7 +1,7 @@
 NODE(1)
 =======
 Ryan Dahl <ry@tinyclouds.org>
-Version, 0.1.17, 2009.11.07
+Version, 0.1.18, 2009.11.17
 
 
 == NAME
diff --git a/doc/index.html b/doc/index.html
index 1651a42206..43223da305 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -97,8 +97,8 @@ server.listen(7000, "localhost");</pre>
         <a href="http://github.com/ry/node/tree/master">git repo</a>
       </p>
       <p>
-        2009.11.07
-        <a href="http://s3.amazonaws.com/four.livejournal/20091107/node-v0.1.17.tar.gz">node-v0.1.17.tar.gz</a>
+        2009.11.17
+        <a href="http://s3.amazonaws.com/four.livejournal/20091117/node-v0.1.18.tar.gz">node-v0.1.18.tar.gz</a>
       </p>
 
       <h2 id="build">Build</h2>
diff --git a/wscript b/wscript
index 3bc403bd53..1d1e041239 100644
--- a/wscript
+++ b/wscript
@@ -7,7 +7,7 @@ from os.path import join, dirname, abspath
 from logging import fatal
 
 cwd = os.getcwd()
-VERSION="0.1.17"
+VERSION="0.1.18"
 APPNAME="node.js"
 
 import js2c