diff --git a/ChangeLog.md b/ChangeLog.md
index 8475f61d..66fbc17a 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -14,6 +14,34 @@
 
 
 
+# ZNC 1.6.3 (2016-02-16)
+
+## Core
+* New character encoding is now applied immediately, without reconnect.
+* Fixed build with LibreSSL.
+* Fixed error 404 when accessing the web UI with the configured URI prefix,
+  but without the `/` in the end.
+* `znc-buildmod` now exits with non-zero exit code when the .cpp file is not found.
+* Fixed `znc-buildmod` on Cygwin.
+* ExpandString got expanded. It now expands `%znc%` to
+  `ZNC <version> - http://znc.in`, honoring the global "Hide version" setting.
+* Default quit message is switched from `ZNC <version> - http://znc.in` to `%znc%`,
+  which is the same, but "automatically" changes the shown version when ZNC gets upgraded.
+  Before, the old version was recorded in the user's quit message, and stayed the same
+  regardless of the current version of ZNC.
+
+## Modules
+* modperl:
+    * Fixed a memory leak.
+* sasl:
+    * Added an option to show which mechanisms failed or succeeded.
+* webadmin:
+    * Fixed an error message on invalid user settings to say what exactly was invalid.
+    * No more autocomplete password in user settings. It led to an error when ZNC
+      thought the user is going to change a password, but the passwords didn't match.
+
+
+
 # ZNC 1.6.2 (2015-11-15)
 
 ## Fixes
diff --git a/src/User.cpp b/src/User.cpp
index 7f2598a6..76b77956 100644
--- a/src/User.cpp
+++ b/src/User.cpp
@@ -591,12 +591,13 @@ CString& CUser::ExpandString(const CString& sStr, CString& sRet) const {
     sRet.Replace("%user%", GetUserName());
     sRet.Replace("%version%", CZNC::GetVersion());
     sRet.Replace("%vhost%", GetBindHost());
+    sRet.Replace("%znc%", CZNC::GetTag(false));
 
     // Allows for escaping ExpandString if necessary, or to prevent
     // defaults from kicking in if you don't want them.
     sRet.Replace("%empty%", "");
     // The following lines do not exist. You must be on DrUgS!
-    sRet.Replace("%znc%", "All your IRC are belong to ZNC");
+    sRet.Replace("%irc%", "All your IRC are belong to ZNC");
     // Chosen by fair zocchihedron dice roll by SilverLeo
     sRet.Replace("%rand%", "42");
 
@@ -1467,9 +1468,7 @@ bool CUser::HasSpaceForNewNetwork() const {
     return GetNetworks().size() < MaxNetworks();
 }
 
-CString CUser::GetQuitMsg() const {
-    return (!m_sQuitMsg.Trim_n().empty()) ? m_sQuitMsg : CZNC::GetTag(false);
-}
+CString CUser::GetQuitMsg() const { return (!m_sQuitMsg.Trim_n().empty()) ? m_sQuitMsg : "%znc%"; }
 const MCString& CUser::GetCTCPReplies() const { return m_mssCTCPReplies; }
 unsigned int CUser::GetBufferCount() const { return GetChanBufferSize(); }
 unsigned int CUser::GetChanBufferSize() const { return m_uChanBufferSize; }