diff --git a/ChangeLog.md b/ChangeLog.md
index 5337647b..a304d2fa 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,23 @@
+# ZNC 1.6.4 (2016-12-10)
+
+## Fixes
+
+* Fixed build with OpenSSL 1.1.
+* Fixed build on Cygwin.
+* Fixed a segfault after cloning a user. The bug was introduced in ZNC 1.6.0.
+* Fixed a segfault when deleting a user or network which is waiting for DNS
+  during connection. The bug was introduced in ZNC 1.0.
+* Fixed a segfault which could be triggered using alias module.
+* Fixed an error in controlpanel module when setting the bindhost of another user.
+* Fixed route_replies to not cause client to disconnect by timeout.
+* Fixed compatibility with the Gitter IRC bridge.
+
+## Internal
+* Fixed `OnInvite` for modpython and modperl.
+* Fixed external location of GoogleTest for `make test`.
+
+
+
 # ZNC 1.6.3 (2016-02-16)
 
 ## Core
diff --git a/configure.ac b/configure.ac
index 0a4cbfcb..8ec48760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_DEFUN([AC_PROG_CC], [m4_errprint(__file__:__line__[: Something is trying to u
 dnl Needed for AC_PATH_PROGS_FEATURE_CHECK which was added in 2.62
 AC_PREREQ([2.62])
 dnl Keep the version number in sync with version.h!
-AC_INIT([znc], [1.6.4-rc3])
+AC_INIT([znc], [1.6.4])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/znc.cpp])
 AC_LANG([C++])