diff --git a/ChangeLog b/ChangeLog
index 19a5fa40f4ae8ca2d9372f77323b17faf0070ea1..2c06376057bbcf7858642a2c343561118199c581 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Gajim 0.12.1 (21 December 2008)
+
+  * Fix filetransfer
+  * Updated german translation
+  * Fix click on notifications when text string is empty
+  * Improve systray popup menu
+
 Gajim 0.12 (17 December 2008)
 
   * Fix text rendering in notifications
diff --git a/configure.ac b/configure.ac
index c2f2b2646d0634bd42a2a43d04eb6e2a0db06f46..5f1302b2b68cb1b39598e1d33031e6f34000a106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.12],[http://trac.gajim.org/],[gajim])
+		[0.12.1],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.8])
 AC_CONFIG_HEADER(config.h)
diff --git a/debian/changelog b/debian/changelog
index 962433b31ce92d11e31194448349e89e9f10027e..1db2d409375030e568627172ea9eae03279de779 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gajim (0.12-1) unstable; urgency=low
+gajim (0.12.1-1) unstable; urgency=low
 
   * New upstream release.
   * Fix coming back from suspend. Closes: #500523
@@ -15,7 +15,7 @@ gajim (0.12-1) unstable; urgency=low
   * Depends on libc6 for gtkspell.so module
   * Build Gajim modules against python2.5
 
- -- Yann Leboulanger <asterix@lagaule.org>  Wed, 17 Dec 2008 10:02:52 +0100
+ -- Yann Leboulanger <asterix@lagaule.org>  Wed, 21 Dec 2008 14:40:16 +0100
 
 gajim (0.11.4-1) unstable; urgency=low
 
diff --git a/gajim.nsi b/gajim.nsi
index 58955bbe23f48fb4f971b4398ff6ca3e8d531f72..1f66a2ed8c714dd396870ae50b94511d82f5040f 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -189,7 +189,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.12"
+	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.12.1"
 	WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
 	WriteUninstaller "$INSTDIR\Uninstall.exe"
 
diff --git a/setup_osx.py b/setup_osx.py
index 131697fd609e18bb488c9a69dbf04fa59aa5a81b..29dabd5229627dd59d348caf43d5ba736374b01f 100644
--- a/setup_osx.py
+++ b/setup_osx.py
@@ -35,7 +35,7 @@ from shutil import move, copy, copytree, rmtree
 
 GTK_DIR="/Library/Frameworks/GTK+.framework/Versions/Current"
 NAME = 'Gajim'
-VERSION = '0.12'
+VERSION = '0.12.1'
 DESCRIPTION = 'A full featured Jabber client'
 AUTHOR = 'Gajim Development Team'
 URL = 'http://www.gajim.org/'
diff --git a/setup_win32.py b/setup_win32.py
index 4be8a1f1411df74f4966ca241865aad4056d0a30..2643a9a57be6f089946fb5c8c1e5a94a6866b7ad 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -71,7 +71,7 @@ opts = {
 
 setup(
     name = 'Gajim',
-    version = '0.12',
+    version = '0.12.1',
     description = 'A full featured Jabber client',
     author = 'Gajim Development Team',
     url = 'http://www.gajim.org/',
diff --git a/src/common/defs.py b/src/common/defs.py
index 0b124619a04a8c0c3a66d668af35df531be2549f..5d61ee490e2c98c050b3feaa406d9f7d09913aac 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -28,7 +28,7 @@ import re
 docdir = '../'
 datadir = '../'
 
-version = '0.12'
+version = '0.12.1'
 
 import sys, os.path
 for base in ('.', 'common'):