diff --git a/ChangeLog b/ChangeLog
index d6f89d3b54dad99fe7df1eef0eedd3004044e700..dfc2e6160c014c0e22f556d5b7bd90643e890957 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Gajim 0.16.5 (28 December 2015)
+
+  * Improve MAM implementation
+  * Improve security on connexion and for roster managment
+  * Ability for emoticons to be sorted in menu
+
 Gajim 0.16.4 (26 September 2015)
 
   * Fix trusting GPG keys
diff --git a/THANKS b/THANKS
index 0cdfdf56d03ca41acd46276b6cef9ce8feee1105..89714f56e26cfed5d0c3163ba92de4401a8cc181 100644
--- a/THANKS
+++ b/THANKS
@@ -35,6 +35,7 @@ Petr Menšík
 Sergey Kuleshov
 Stavros Giannouris
 Stian B. Barmen
+Thilo Molitor
 Thomas Klein-Hitpaß
 Urtzi Alfaro
 Witold KieraÅ›
diff --git a/autogen.sh b/autogen.sh
index e9a3bb919c809034a32cd7bf6acd57ba70a2a376..f1cad3438bf9680095ef6e9ab3e3338e96ba9469 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-  gajimversion="0.16.4"
+  gajimversion="0.16.5"
   if [ -d ".hg" ]; then
     node=$(hg  tip --template "{node}")
     hgversion="-${node:0:12}"
diff --git a/debian/changelog b/debian/changelog
index 5d28c7516197514873349cb288a5d74cd90554d3..770b12719b22e82cce1464b073ec55751df06878 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gajim (0.16.5-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Yann Leboulanger <yann@leboulanger.org>  Sun, 28 Dec 2015 13:36:41 +0200
+
 gajim (0.16.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/gajim.nsi b/gajim.nsi
index 007e1cf4c16e3dbd024256789618044d49a5b4df..9b3f708021a6431129463521646a41d50e464636 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -213,7 +213,7 @@ Section "Gajim" SecGajim
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe"
-	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.5"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
diff --git a/setup_win32.py b/setup_win32.py
index 9bd12263db2ca66900bf3beeb6acfe6938225e52..325dfc155ff7a5d1e8089f01ba42dfe53a76ac14 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -57,7 +57,7 @@ options = {
 
 setup(
     name='Gajim',
-    version='0.16.4',
+    version='0.16.5',
     description='A full featured Jabber client',
     author='Gajim Development Team',
     url='http://gajim.org/',
diff --git a/src/common/defs.py b/src/common/defs.py
index 28aa8b8c81ce6e4b785720db8aae813d3197abe3..29d5714a99fdfeac412a0121622c8539b2e9f58c 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
 basedir   = '../'
 localedir = '../po'
 
-version = '0.16.4.1'
+version = '0.16.5'
 import subprocess
 try:
     node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,