diff --git a/configure.ac b/configure.ac
index 6a9439ba2dc5bb00702c35309466ccf0a36d44db..2110a4f0263fb1e248aaa44a980789e0350ea173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_INIT([Gajim - A Jabber Instant Messager],
-		[0.11.1.5],[http://trac.gajim.org/],[gajim])
+		[0.11.2.0-svn],[http://trac.gajim.org/],[gajim])
 AC_PREREQ([2.59])
 AM_INIT_AUTOMAKE([1.8])
 AC_CONFIG_HEADER(config.h)
diff --git a/src/common/connection_handlers.py b/src/common/connection_handlers.py
index e9b27a6387b372704a4a659b13944fbac2379cd4..4fbba26da6df3e70f77c432137fac4f0ce733712 100644
--- a/src/common/connection_handlers.py
+++ b/src/common/connection_handlers.py
@@ -647,7 +647,8 @@ class ConnectionDisco:
 			common.xmpp.NS_DISCO, frm = to)
 		iq.setAttr('id', id)
 		query = iq.setTag('query')
-		query.setAttr('node','http://gajim.org/caps#' + gajim.version)
+		query.setAttr('node','http://gajim.org/caps#' + gajim.version.split('-',
+			1)[0])
 		for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, \
 						common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS):
 			feature = common.xmpp.Node('feature')
@@ -726,7 +727,8 @@ class ConnectionDisco:
 			extension = None
 			if node and node.find('#') != -1:
 				extension = node[node.index('#') + 1:]
-			client_version = 'http://gajim.org/caps#' + gajim.version
+			client_version = 'http://gajim.org/caps#' + gajim.version.split('-',
+				1)[0]
 
 			if node in (None, client_version):
 				q.addChild('feature', attrs = {'var': common.xmpp.NS_BYTESTREAM})
@@ -848,7 +850,7 @@ class ConnectionVcard:
  
 		if len(ext):
 			c.setAttr('ext', ' '.join(ext))
-		c.setAttr('ver', gajim.version)
+		c.setAttr('ver', gajim.version.split('-', 1)[0])
 		return p
 	
 	def node_to_dict(self, node):
diff --git a/src/common/defs.py b/src/common/defs.py
index d557e6912efc6c923e6eab278da19a5e0bd12f32..18af3b5c6a2a2ad2909e4a224f30463b1d4490fc 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -2,7 +2,7 @@ docdir = '../'
 
 datadir = '../'
 
-version = '0.11.1.5'
+version = '0.11.2.0-svn'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index 6123ab56719f6f401cb29fab75664f91fbfc56cb..cfed4994dbc3860055bcf5d7c385ee51f696ec35 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -61,6 +61,7 @@ class OptionsParser:
 			return
 
 		new_version = gajim.config.get('version')
+		new_version = new_version.split('-', 1)[0]
 		for line in fd.readlines():
 			try:
 				line = line.decode('utf-8')
@@ -68,6 +69,7 @@ class OptionsParser:
 				line = line.decode(locale.getpreferredencoding())
 			self.read_line(line)
 		old_version = gajim.config.get('version')
+		old_version = old_version.split('-', 1)[0]
 
 		self.update_config(old_version, new_version)
 		self.old_values = {} # clean mem