diff -Nru language-selector-0.165.3/debian/changelog language-selector-0.165.4/debian/changelog
--- language-selector-0.165.3/debian/changelog	2016-05-25 21:09:12.000000000 +0000
+++ language-selector-0.165.4/debian/changelog	2016-07-22 13:23:15.000000000 +0000
@@ -1,3 +1,11 @@
+language-selector (0.165.4) xenial; urgency=medium
+
+  * LanguageSelector/ImConfig.py:
+    Use "none" as default for non-CJKV languages on certain flavors
+    instead of "xim" (LP: #1605408).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Fri, 22 Jul 2016 15:23:00 +0200
+
 language-selector (0.165.3) xenial; urgency=medium
 
   * LanguageSelector/gtk/GtkLanguageSelector.py,
diff -Nru language-selector-0.165.3/LanguageSelector/ImConfig.py language-selector-0.165.4/LanguageSelector/ImConfig.py
--- language-selector-0.165.3/LanguageSelector/ImConfig.py	2016-05-25 19:11:05.000000000 +0000
+++ language-selector-0.165.4/LanguageSelector/ImConfig.py	2016-07-22 13:14:32.000000000 +0000
@@ -42,7 +42,7 @@
           or locale.getlocale(locale.LC_CTYPE)[0][:3] in ['zh_', 'ja_', 'ko_', 'vi_']:
             system_default = autoConfig
         else:
-            system_default = 'xim'
+            system_default = 'none'
         if systemConfig == 'default':
             system_conf = system_default
         elif os.path.exists('/etc/X11/xinit/xinputrc'):