diff --git a/configure.ac b/configure.ac
index abd261585..0887f90dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.11.1.0],[http://trac.gajim.org/],[gajim])
+		[0.11.1.1],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.8])
 AC_CONFIG_HEADER(config.h)
diff --git a/src/common/defs.py b/src/common/defs.py
index fe72a8e98..4fa536584 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -2,7 +2,7 @@ docdir = '../'
 
 datadir = '../'
 
-version = '0.11.1.0'
+version = '0.11.1.1'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 55047ef7f..fbba72539 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -153,8 +153,8 @@ class OptionsParser:
 			self.update_config_to_01101()
 		if old < [0, 11, 0, 2] and new >= [0, 11, 0, 2]:
 			self.update_config_to_01102()
-		if old < [0, 12] and new >= [0, 12]:
-			self.update_config_to_012()
+		if old < [0, 11, 1, 1] and new >= [0, 11, 1, 1]:
+			self.update_config_to_01111()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
@@ -387,11 +387,11 @@ class OptionsParser:
 				self.old_values['ft_override_host_to_send'])
 		gajim.config.set('version', '0.11.0.2')
 	
-	def update_config_to_012(self):
+	def update_config_to_01111(self):
 		'''always_hide_chatbuttons -> compact_view'''
 		if self.old_values.has_key('always_hide_groupchat_buttons') and \
 		self.old_values.has_key('always_hide_chat_buttons'):
 			gajim.config.set('compact_view', self.old_values['always_hide_groupchat_buttons'] and \
 			self.old_values['always_hide_chat_buttons'])
-		gajim.config.set('version', '0.12')
+		gajim.config.set('version', '0.11.1.1')