diff --git a/.travis.yml b/.travis.yml
index 91878e77..951ae297 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,7 +98,9 @@ after_success:
 notifications:
     irc:
         channels:
-            - "irc.freenode.net#znc-dev"
+            # travis encrypt "irc.freenode.net#znc-dev" -r znc/znc
+            # prevents forks from spamming #znc-dev by just enabling Travis
+            - secure: "ACdKvJT+gvuzDTfQkhnHI8aQNtXHI1tJOgFPss9XpF8025KYxrvhuff15VRhYuDCuNSuqhZYG9Oz+ZCQzu85ravkXVa3X+ze8SRoIIwAN2tpkr7KTfbJc4gD2S/RZUi432ICiQznHWnhV209XSLXY4qBhnR0OkCg5/pY8zievYw="
         on_success: always
         on_failure: always
 sudo: required
diff --git a/ChangeLog.md b/ChangeLog.md
index e6e147e2..c54b5da1 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,6 +1,6 @@
 # (unreleased)
 
-## Changes
+## Changes (need to verify this)
 
 * workarounds during config parsing for old ZNC versions removed
     * incompatible configs give an error during startup indicating the problem
@@ -14,6 +14,50 @@
 
 
 
+# ZNC 1.6.2 (2015-11-15)
+
+## Fixes
+
+* Fixed a use-after-delete in webadmin. It was already partially fixed in ZNC 1.4; since 1.4 it has been still possible to trigger, but much harder.
+* Fixed a startup failure when awaynick and simple_away were both loaded, and simple_away had arguments.
+* Fixed a build failure when using an ancient OpenSSL version.
+* Fixed a build failure when using OpenSSL which was built without SSLv3 support.
+* Bindhost was sometimes used as ident.
+* `CAP :END` wasn't parsed correctly, causing timeout during login for some clients.
+* Fixed channel keys if client joined several channels in single command.
+* Fixed memory leak when reading an invalid config.
+
+## Modules
+
+* autovoice:
+    * Check for autovoices when we are opped.
+* controlpanel:
+    * Fixed `DelCTCPReply` case-insensitivity.
+* dcc:
+    * Add missing return statement. It was harmless.
+* modpython:
+    * Fixed a memory leak.
+* modules_online:
+    * Wrong ident was used before.
+* stickychan:
+    * Fixed to unstick inaccessible channels to avoid infinite join loops.
+
+## Internal
+
+* Fixed the nick passed to `CModule::OnChanMsg()` so it has channel permissions set.
+* Fixed noisy `-Winconsistent-missing-override` compilation warnings.
+* Initialized some fields in constructors of modules before `OnLoad()`.
+
+## Cosmetic
+
+* Various modules had commands with empty descriptions.
+* perform:
+    * Say "number" instead of "nr".
+* route_replies:
+    * Make the timeout error message more clear.
+
+
+
 # ZNC 1.6.1 (2015-08-04)
 
 ## Fixes
diff --git a/configure.ac b/configure.ac
index b1f7c04b..b76e809b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,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 main.h!
+dnl Keep the version number in sync with version.h!
 AC_INIT([znc], [1.7.x])
 LIBZNC_VERSION=1.7
 AC_CONFIG_MACRO_DIR([m4])
diff --git a/third_party/Csocket b/third_party/Csocket
index 3e700fdf..8d720c94 160000
--- a/third_party/Csocket
+++ b/third_party/Csocket
@@ -1 +1 @@
-Subproject commit 3e700fdf88c394656c608f6b001aec8111357e37
+Subproject commit 8d720c94977947ac73dce6901b92a13ee16aa2a9