diff --git a/AUTHORS b/AUTHORS
index b605a0f3..eb8501aa 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -338,3 +338,8 @@ zzzjim <zzzjim@users.noreply.github.com>
 Alex Arslan <ararslan@comcast.net>
 Kyle Farnung <kfarnung@microsoft.com>
 ssrlive <30760636+ssrlive@users.noreply.github.com>
+Tobias Nießen <tniessen@tnie.de>
+Björn Linse <bjorn.linse@gmail.com>
+zyxwvu Shi <i@shiyc.cn>
+Peter Johnson <johnson.peter@gmail.com>
+Paolo Greppi <paolo.greppi@libpf.com>
diff --git a/ChangeLog b/ChangeLog
index 0ec14884..38d2e142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,100 @@
+2018.06.23, Version 1.21.0 (Stable)
+
+Changes since version 1.20.3:
+
+* unix,windows: map EFTYPE errno (cjihrig)
+
+* win: perform case insensitive PATH= comparison (cjihrig)
+
+* win, fs: uv_fs_fchmod support for -A files (Bartosz Sosnowski)
+
+* src,lib: fix comments (Tobias Nießen)
+
+* win,process: allow child pipe handles to be opened in overlapped mode (Björn
+  Linse)
+
+* src,test: fix idiosyncratic comment style (Bert Belder)
+
+* test: fs_fchmod_archive_readonly must return a value (Bert Belder)
+
+* win,pipe: fix incorrect error code returned from uv_pipe_write_impl() (Bert
+  Belder)
+
+* win,pipe: properly set uv_write_t.send_handle in uv_write2() (Bert Belder)
+
+* test: add vectored uv_write() ping-pong tests (Bert Belder)
+
+* win,pipe: support vectored uv_write() calls (Bert Belder)
+
+* win,pipe: refactor pipe read cancellation logic (Bert Belder)
+
+* test: improve output from IPC test helpers (Bert Belder)
+
+* test: add test for IPC deadlock on Windows (
+
+* win,pipe: fix IPC pipe deadlock (Bert Belder)
+
+* unix: catch some cases of watching fd twice (Ben Noordhuis)
+
+* test: use custom timeout for getaddrinfo_fail_sync (Ben Noordhuis)
+
+* Revert "win: add Windows XP support to uv_if_indextoname()" (Bert Belder)
+
+* win,thread: remove fallback uv_cond implementation (Bert Belder)
+
+* src,test: s/olny/only (cjihrig)
+
+* unix: close signal pipe fds on unload (Ben Noordhuis)
+
+* win: allow setting udp socket options before bind (cjihrig)
+
+* unix: return UV_ENOTSUP on FICLONE_FORCE failure (cjihrig)
+
+* win,pipe: remove unreferenced local variable (Bert Belder)
+
+* win,code: remove GetQueuedCompletionStatus-based poller (Bert Belder)
+
+* win: remove the remaining dynamic kernel32 imports (Bert Belder)
+
+* test: speedup process-title-threadsafe on macOS (cjihrig)
+
+* core: move all include files except uv.h to uv/ (Saúl Ibarra Corretgé)
+
+* win: move stdint-msvc2008.h to include/uv/ (Ben Noordhuis)
+
+* build: fix cygwin install (Ben Noordhuis)
+
+* build,win: remove MinGW Makefile (Saúl Ibarra Corretgé)
+
+* build: add a cmake build file (Ben Noordhuis)
+
+* build: add test suite option to cmake build (Ben Noordhuis)
+
+* unix: set errno in uv_fs_copyfile() (cjihrig)
+
+* samples: fix inconsistency in parse_opts vs usage (zyxwvu Shi)
+
+* linux: handle exclusive POLLHUP with UV_DISCONNECT (Brad King)
+
+* include: declare uv_cpu_times_s in higher scope (Peter Johnson)
+
+* doc: add uv_fs_fsync() AIX limitations (jBarz)
+
+* unix,win: add uv_fs_lchown() (Paolo Greppi)
+
+* unix: disable clang variable length array warning (Peter Johnson)
+
+* doc: document uv_pipe_t::ipc (Ed Schouten)
+
+* doc: undocument uv_req_type's UV_REQ_TYPE_PRIVATE (Ed Schouten)
+
+* doc: document UV_*_MAP() macros (Ed Schouten)
+
+* win: remove use of min() macro in pipe.c (Peter Johnson)
+
+* doc: add jbarz as maintainer (
+
+
 2018.05.08, Version 1.20.3 (Stable), 8cfd67e59195251dff793ee47c185c9d6a8f3818
 
 Changes since version 1.20.2:
diff --git a/configure.ac b/configure.ac
index 5178c60b..c3a6a779 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_PREREQ(2.57)
-AC_INIT([libuv], [1.20.3], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.21.0], [https://github.com/libuv/libuv/issues])
 AC_CONFIG_MACRO_DIR([m4])
 m4_include([m4/libuv-extra-automake-flags.m4])
 m4_include([m4/as_case.m4])
diff --git a/include/uv/version.h b/include/uv/version.h
index 66c2370f..0b829717 100644
--- a/include/uv/version.h
+++ b/include/uv/version.h
@@ -31,10 +31,10 @@
  */
 
 #define UV_VERSION_MAJOR 1
-#define UV_VERSION_MINOR 20
-#define UV_VERSION_PATCH 4
-#define UV_VERSION_IS_RELEASE 0
-#define UV_VERSION_SUFFIX "dev"
+#define UV_VERSION_MINOR 21
+#define UV_VERSION_PATCH 0
+#define UV_VERSION_IS_RELEASE 1
+#define UV_VERSION_SUFFIX ""
 
 #define UV_VERSION_HEX  ((UV_VERSION_MAJOR << 16) | \
                          (UV_VERSION_MINOR <<  8) | \