diff --git a/src/common/defs.py b/src/common/defs.py
index 18af3b5c6a2a2ad2909e4a224f30463b1d4490fc..86ee6dce17968598f8ed77dc704bf9b80f11429b 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -2,7 +2,7 @@ docdir = '../'
 
 datadir = '../'
 
-version = '0.11.2.0-svn'
+version = '0.11.2.1-svn'
 
 import sys, os.path
 for base in ('.', 'common'):
diff --git a/src/common/optparser.py b/src/common/optparser.py
index cfed4994dbc3860055bcf5d7c385ee51f696ec35..7a67b8b8c8e0180e7edab1724c4295c87107eb6a 100644
--- a/src/common/optparser.py
+++ b/src/common/optparser.py
@@ -166,6 +166,8 @@ class OptionsParser:
 			self.update_config_to_01114()
 		if old < [0, 11, 1, 5] and new >= [0, 11, 1, 5]:
 			self.update_config_to_01115()
+		if old < [0, 11, 2, 1] and new >= [0, 11, 2, 1]:
+			self.update_config_to_01121()
 
 		gajim.logger.init_vars()
 		gajim.config.set('version', new_version)
@@ -479,3 +481,16 @@ class OptionsParser:
 			pass
 		con.close()
 		gajim.config.set('version', '0.11.1.5')
+
+	def update_config_to_01121(self):
+		# remove old unencrypted secrets file
+		from common.configpaths import gajimpaths
+
+		new_file = gajimpaths['SECRETS_FILE']
+
+		old_file = os.path.dirname(new_file) + '/secrets'
+
+		if os.path.exists(old_file):
+			os.remove(old_file)
+
+		gajim.config.set('version', '0.11.2.1')