diff --git a/.mailmap b/.mailmap
index a1e5f71ab..5c76ed76a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
 Alan Gutierrez <alan@prettyrobots.com> <alan@blogometer.com>
+Andrius Bentkus <andrius.bentkus@gmail.com> <toxedvirus@gmail.com>
 Bert Belder <bertbelder@gmail.com> <info@2bs.nl>
 Bert Belder <bertbelder@gmail.com> <user@ChrUbuntu.(none)>
 Brandon Philips <brandon.philips@rackspace.com> <brandon@ifup.org>
diff --git a/AUTHORS b/AUTHORS
index a7c48c4f3..9cb892c2b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -108,3 +108,5 @@ Andrej Manduch <AManduch@gmail.com>
 Joshua Neuheisel <joshua@neuheisel.us>
 Alexis Campailla <alexis@janeasystems.com>
 Yorkie <yorkiefixer@gmail.com>
+Sam Roberts <vieuxtech@gmail.com>
+River Tarnell <river@loreley.flyingparchment.org.uk>
diff --git a/ChangeLog b/ChangeLog
index 5ee533823..cff1046ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2013.12.32, Version 0.11.17 (Unstable)
+
+Changes since version 0.11.16:
+
+* stream: allow multiple buffers for uv_try_write (Fedor Indutny)
+
+* unix: fix a possible memory leak in uv_fs_readdir (Alex Crichton)
+
+* unix, windows: add uv_loop_alive() function (Sam Roberts)
+
+* windows: avoid assertion failure when pipe server is closed (Bert Belder)
+
+* osx: Fix a possible segfault in uv__io_poll (Alex Crichton)
+
+* stream: fix uv__stream_osx_select (Fedor Indutny)
+
+
 2013.12.14, Version 0.11.16 (Unstable), ae0ed8c49d0d313c935c22077511148b6e8408a4
 
 Changes since version 0.11.15:
diff --git a/src/version.c b/src/version.c
index c9e4200a7..d50fea7cb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -32,7 +32,7 @@
 #define UV_VERSION_MAJOR 0
 #define UV_VERSION_MINOR 11
 #define UV_VERSION_PATCH 17
-#define UV_VERSION_IS_RELEASE 0
+#define UV_VERSION_IS_RELEASE 1
 
 
 #define UV_VERSION  ((UV_VERSION_MAJOR << 16) | \