diff --git a/configure.ac b/configure.ac
index b4e09eeb080975766ada345a627ff7c6989e97d5..9730c0d382d0d23d078c26a6f265031e15256f4c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.12.1.5-svn],[http://trac.gajim.org/],[gajim])
+		[0.12.3.1-dev],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 
 AC_CONFIG_HEADER(config.h)
diff --git a/src/common/defs.py b/src/common/defs.py
index 6a1b8438f48046089f07a9629932d98fc699b9a5..c321440d0c6a339d348f9bd5f4c4aa82c628c83d 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
 datadir = '../'
 localedir = '../po'
 
-version = '0.12.1.6-hg'
+version = '0.12.3.1-dev'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 6907dc4b9d55975b52a7ce419fb6e9043b1e5354..de887eb85cc9db1e99d35998b70d59ff6892d359 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -198,8 +198,8 @@ class OptionsParser:
 			self.update_config_to_01214()
 		if old < [0, 12, 1, 5] and new >= [0, 12, 1, 5]:
 			self.update_config_to_01215()
-		if old < [0, 12, 1, 6] and new >= [0, 12, 1, 6]:
-			self.update_config_to_01216()
+		if old < [0, 12, 3, 1] and new >= [0, 12, 3, 1]:
+			self.update_config_to_01231()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
@@ -673,7 +673,7 @@ class OptionsParser:
 			gajim.config.set_per('soundevents', evt, 'path', path)
 		gajim.config.set('version', '0.12.1.5')
 
-	def update_config_to_01216(self):
+	def update_config_to_01231(self):
 		back = os.getcwd()
 		os.chdir(logger.LOG_DB_FOLDER)
 		con = sqlite.connect(logger.LOG_DB_FILE)
@@ -703,7 +703,7 @@ class OptionsParser:
 		except sqlite.OperationalError:
 			pass
 		con.close()
-		gajim.config.set('version', '0.12.1.6')
+		gajim.config.set('version', '0.12.3.1')