diff --git a/ChangeLog.md b/ChangeLog.md
index fff2933b..8a194dde 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -20,6 +20,26 @@
 
 
 
+# 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-23)
 
 ## Core
diff --git a/configure.ac b/configure.ac
index e7f79b05..80c8a9f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,7 @@ AC_DEFUN([ZNC_AUTO_FAIL], [
 ])
 
 # AC_PROG_CXX sets CXXFLAGS to "-O2 -g" if it is unset which we don't want
-CXXFLAGS="$CXXFLAGS "
+CXXFLAGS="$CXXFLAGS -DOPENSSL_NO_COMP=1"
 AC_PROG_CXX
 # "Optional" because we want custom error message
 AX_CXX_COMPILE_STDCXX_11([noext], [optional])