diff -Nru language-selector-0.165.2/debian/changelog language-selector-0.165.3/debian/changelog
--- language-selector-0.165.2/debian/changelog	2016-05-10 23:44:12.000000000 +0000
+++ language-selector-0.165.3/debian/changelog	2016-05-25 21:09:12.000000000 +0000
@@ -1,3 +1,12 @@
+language-selector (0.165.3) xenial; urgency=medium
+
+  * LanguageSelector/gtk/GtkLanguageSelector.py,
+    LanguageSelector/ImConfig.py:
+    Add an explicit XIM input method option, and let "none" be truly
+    "none" (and not "xim") to prevent confusion (LP: #1585797).
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 25 May 2016 23:09:00 +0200
+
 language-selector (0.165.2) xenial; urgency=medium
 
   * language_support_pkgs.py:
diff -Nru language-selector-0.165.2/LanguageSelector/gtk/GtkLanguageSelector.py language-selector-0.165.3/LanguageSelector/gtk/GtkLanguageSelector.py
--- language-selector-0.165.2/LanguageSelector/gtk/GtkLanguageSelector.py	2016-03-19 00:26:10.000000000 +0000
+++ language-selector-0.165.3/LanguageSelector/gtk/GtkLanguageSelector.py	2016-05-25 18:33:38.000000000 +0000
@@ -453,7 +453,7 @@
         currentIM = self.ImConfig.getCurrentInputMethod()
 
         # find out about the other options
-        names = dict(xim=_('none'), ibus='IBus', scim='SCIM', hangul='Hangul', thai='Thai')
+        names = dict(none=_('none'), xim='XIM', ibus='IBus', scim='SCIM', hangul='Hangul', thai='Thai')
         for (i, IM) in enumerate(self.ImConfig.getAvailableInputMethods()):
             name = names[IM] if IM in names else IM
             iter = model.append()
diff -Nru language-selector-0.165.2/LanguageSelector/ImConfig.py language-selector-0.165.3/LanguageSelector/ImConfig.py
--- language-selector-0.165.2/LanguageSelector/ImConfig.py	2016-03-08 12:48:42.000000000 +0000
+++ language-selector-0.165.3/LanguageSelector/ImConfig.py	2016-05-25 19:11:05.000000000 +0000
@@ -17,8 +17,9 @@
         return os.path.exists('/usr/bin/im-config')
 
     def getAvailableInputMethods(self):
-        inputMethods = subprocess.check_output(['im-config', '-l']).decode().split()
-        return sorted(inputMethods)
+        inputMethods = sorted(subprocess.check_output(['im-config', '-l']).decode().split())
+        inputMethods.append('none')
+        return inputMethods
 
     def getCurrentInputMethod(self):
         (systemConfig, userConfig, autoConfig) = \