diff --git a/.mailmap b/.mailmap
index 87d63bed..2ae2968c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -17,6 +17,7 @@ Imran Iqbal <imrani@ca.ibm.com> <imran@imraniqbal.org>
 Isaac Z. Schlueter <i@izs.me>
 Jason Williams <necmon@yahoo.com>
 Jesse Gorzinski <jgorzinski@gmail.com>
+Jesse Gorzinski <jgorzinski@gmail.com> <jgorzins@us.ibm.com>
 Justin Venus <justin.venus@gmail.com> <justin.venus@orbitz.com>
 Keno Fischer <kenof@stanford.edu> <kfischer+github@college.harvard.edu>
 Keno Fischer <kenof@stanford.edu> <kfischer@college.harvard.edu>
diff --git a/AUTHORS b/AUTHORS
index 491eded7..17d67a64 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -418,3 +418,9 @@ Dominique Dumont <dod@debian.org>
 Manuel BACHMANN <tarnyko@tarnyko.net>
 Marek Vavrusa <marek@vavrusa.com>
 TK-one <tk5641@naver.com>
+Irek Fakhrutdinov <ifakhrutdinov@rocketsoftware.com>
+Lin Zhang <linroid@gmail.com>
+毛毛 <srayuws@users.noreply.github.com>
+Sk Sajidul Kadir <sheikh.sajid522@gmail.com>
+twosee <twose@qq.com>
+Rikard Falkeborn <rikard.falkeborn@gmail.com>
diff --git a/ChangeLog b/ChangeLog
index f45ba985..f218acd9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2020.04.16, Version 1.36.0 (Stable)
+
+Changes since version 1.35.0:
+
+* build: add aix-common.c for AIX cmake build (Jesse Gorzinski)
+
+* zos: explicitly mark message queue events (Irek Fakhrutdinov)
+
+* zos: move mq check out of loop to save cpu cycles (Irek Fakhrutdinov)
+
+* zos: add checks to ensure behavior of epoll_wait (Irek Fakhrutdinov)
+
+* src: add uv__reallocf() (Ben Noordhuis)
+
+* build: ibmi support for cmake (Jesse Gorzinski)
+
+* build: fix gyp build for Android API >= 28 (Lin Zhang)
+
+* udp: return recvmmsg-ed datagrams in order (Saúl Ibarra Corretgé)
+
+* zos,test: fix spawn_empty_env for shared library build (Richard Lau)
+
+* zos: fix non-Release builds (Richard Lau)
+
+* zos: fix return value on expired nanosleep() call (Richard Lau)
+
+* build: fix z/OS cmake build (Richard Lau)
+
+* test: add a bunch of ASSERT macros (Santiago Gimeno)
+
+* test: remove unused extern declaration (Ben Noordhuis)
+
+* test: canonicalize argv[0] in exepath test (Ben Noordhuis)
+
+* test: simplify platform_init() (Ben Noordhuis)
+
+* ibmi: Fix isatty EBADF handling and refactor (Kevin Adler)
+
+* test: Test EBADF tty handling (Kevin Adler)
+
+* build: make cmake build benchmarks (Ben Noordhuis)
+
+* win: use RtlGenRandom from advapi32.dll directly (Ben Noordhuis)
+
+* android: fix OOB write in uv_interface_addresses() (Lin Zhang)
+
+* test: pass test when hostname is single character (毛毛)
+
+* ibmi: set the highest process priority to -10 (Xu Meng)
+
+* build: remove support for gyp (Ben Noordhuis)
+
+* doc: add note to README on cross-compiling (Ben Noordhuis)
+
+* fs: add uv_fs_lutime() (Sk Sajidul Kadir)
+
+* unix: implement cpu_relax() for arm (David Carlier)
+
+* linux: fix uv__accept4() (twosee)
+
+* win: handle file paths in uv_fs_statfs() (erw7)
+
+* unix: fix uv_os_environ() null pointer check (Rikard Falkeborn)
+
+* win: fix uv_os_environ() null pointer check (Rikard Falkeborn)
+
+* unix: fix compilation on macOS 32-bit architectures (Brad King)
+
+* win: replace alloca() with stack-based array (Ben Noordhuis)
+
+
 2020.03.12, Version 1.35.0 (Stable), e45f1ec38db882f8dc17b51f51a6684027034609
 
 Changes since version 1.34.2:
diff --git a/configure.ac b/configure.ac
index d05ec872..e2564937 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.35.0], [https://github.com/libuv/libuv/issues])
+AC_INIT([libuv], [1.36.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 4197bd73..537835ae 100644
--- a/include/uv/version.h
+++ b/include/uv/version.h
@@ -31,10 +31,10 @@
  */
 
 #define UV_VERSION_MAJOR 1
-#define UV_VERSION_MINOR 35
-#define UV_VERSION_PATCH 1
-#define UV_VERSION_IS_RELEASE 0
-#define UV_VERSION_SUFFIX "dev"
+#define UV_VERSION_MINOR 36
+#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) | \