diff --git a/AUTHORS b/AUTHORS
index 9adfeeea985..b51b63a8c17 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -525,7 +525,16 @@ Jacob Hoffman-Andrews <github@hoffman-andrews.com>
 Keith M Wesolowski <wesolows@joyent.com>
 Maxime Quandalle <maxime.quandalle@gmail.com>
 Doron Pagot <doronpagot@gmail.com>
+Oguz Bastemur <obastemur@gmail.com>
 Kenan Sulayman <kenan@sly.mn>
 Christian Schulz <me@rndm.de>
 Pedro Ballesteros <nitroduna@gmail.com>
 Anton Khlynovskiy <subzey@gmail.com>
+Nicolas Talle <dev@nicolab.net>
+Austin Moran <moraustin@gmail.com>
+Mike Pennisi <mike@mikepennisi.com>
+Maxwell Krohn <themax@gmail.com>
+Saúl Ibarra Corretgé <saghul@gmail.com>
+Greg Brail <greg@apigee.com>
+Shuhei Kagawa <shuhei.kagawa@gmail.com>
+Yuriy Nemtsov <nemtsov@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index fdae40dd850..327363b9333 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,67 @@
-2014.01.29, Version 0.11.11 (Unstable)
+2014.03.11, Version 0.11.12 (Unstable)
+
+* uv: Upgrade to v0.11.22 (Timothy J Fontaine)
+
+* buffer: allow toString to accept Infinity for end (Brian White)
+
+* child_process: add spawnSync/execSync (Bert Belder, Timothy J Fontaine)
+
+* cluster: handle bind errors on Windows (Alexis Campailla)
+
+* contextify: handle infinite recursion errors (Fedor Indutny)
+
+* crypto: allow custom generator for DiffieHellman (Brian White)
+
+* crypto: allow setting add'l authenticated data (Brian White)
+
+* crypto: fix CipherFinal return value check (Brian White)
+
+* crypto: make NewSessionDoneCb public (Fedor Indutny)
+
+* dgram: pass the bytes sent to the send callback (Timothy J Fontaine)
+
+* dns: validate arguments in resolver (Kenan Sulayman)
+
+* dns: verify argument is valid function in resolve (Kenan Sulayman)
+
+* http: avoid duplicate keys in writeHead (David Björklund)
+
+* net: add localPort to connect options (Timothy J Fontaine)
+
+* node: do not print SyntaxError hints to stderr (Fedor Indutny)
+
+* node: invoke `beforeExit` again if loop was active (Fedor Indutny)
+
+* node: make AsyncListenerInst field more explicit (Trevor Norris)
+
+* os: networkInterfaces include scopeid for ipv6 (Xidorn Quan)
+
+* process: allow changing `exitCode` in `on('exit')` (Fedor Indutny)
+
+* readline: fix `line` event, if input emit 'end' (Yazhong Liu)
+
+* src: add tracing.v8.on('gc') statistics hooks (Ben Noordhuis)
+
+* src: add v8.getHeapStatistics() function (Ben Noordhuis)
+
+* src: emit 'beforeExit' event on process object (Ben Noordhuis)
+
+* src: move AsyncListener from process to tracing (Trevor Norris)
+
+* tls: fix crash in SNICallback (Fedor Indutny)
+
+* tls: introduce asynchronous `newSession` (Fedor Indutny)
+
+* util: show meaningful values for boxed primitives (Nathan Rajlich)
+
+* vm: don't copy Proxy object from parent context (Ben Noordhuis)
+
+* windows: make stdout/sterr pipes blocking (Alexis Campailla)
+
+* zlib: add sync versions for convenience methods (Nikolai Vavilov)
+
+
+2014.01.29, Version 0.11.11 (Unstable), b46e77421581ea358e221a8a843d057c747f7e90
 
 * v8: Upgrade to 3.22.24.19
 
diff --git a/src/node.cc b/src/node.cc
index 6c7eaf3d2d9..0acdd22ad3d 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -1552,6 +1552,12 @@ static void Cwd(const FunctionCallbackInfo<Value>& args) {
     return env->ThrowUVException(err, "uv_cwd");
   }
 
+#ifdef _WIN32
+  // TODO(tjfontaine) in the future libuv will report the size include the null
+  // for now only windows does, remove conditionals after libuv upgrade
+  cwd_len -= 1;
+#endif
+
   Local<String> cwd = String::NewFromUtf8(env->isolate(),
                                           buf,
                                           String::kNormalString,
diff --git a/src/node_version.h b/src/node_version.h
index 5c73511579c..5016db8aaed 100644
--- a/src/node_version.h
+++ b/src/node_version.h
@@ -26,7 +26,7 @@
 #define NODE_MINOR_VERSION 11
 #define NODE_PATCH_VERSION 12
 
-#define NODE_VERSION_IS_RELEASE 0
+#define NODE_VERSION_IS_RELEASE 1
 
 #ifndef NODE_TAG
 # define NODE_TAG ""