diff --git a/java/res/xml/spellchecker.xml b/java/res/xml/spellchecker.xml
index b4559ffad..2d5f2fc76 100644
--- a/java/res/xml/spellchecker.xml
+++ b/java/res/xml/spellchecker.xml
@@ -23,17 +23,41 @@
 <spell-checker xmlns:android="http://schemas.android.com/apk/res/android"
         android:label="@string/spell_checker_service_name"
         android:settingsActivity="com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsActivity">
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="cs"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="da"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="de"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="el"
+    />
     <subtype
             android:label="@string/subtype_generic"
             android:subtypeLocale="en"
     />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="en_GB"
+    />
     <subtype
             android:label="@string/subtype_generic"
             android:subtypeLocale="en_US"
     />
     <subtype
             android:label="@string/subtype_generic"
-            android:subtypeLocale="en_GB"
+            android:subtypeLocale="es"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="fi"
     />
     <subtype
             android:label="@string/subtype_generic"
@@ -41,7 +65,7 @@
     />
     <subtype
             android:label="@string/subtype_generic"
-            android:subtypeLocale="de"
+            android:subtypeLocale="hr"
     />
     <subtype
             android:label="@string/subtype_generic"
@@ -49,15 +73,19 @@
     />
     <subtype
             android:label="@string/subtype_generic"
-            android:subtypeLocale="es"
+            android:subtypeLocale="iw"
     />
     <subtype
             android:label="@string/subtype_generic"
-            android:subtypeLocale="ru"
+            android:subtypeLocale="lt"
     />
     <subtype
             android:label="@string/subtype_generic"
-            android:subtypeLocale="pt_BR"
+            android:subtypeLocale="lv"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="nb"
     />
     <subtype
             android:label="@string/subtype_generic"
@@ -65,6 +93,38 @@
     />
     <subtype
             android:label="@string/subtype_generic"
-            android:subtypeLocale="cs"
+            android:subtypeLocale="pl"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="pt_BR"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="pt_PT"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="ro"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="ru"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="sl"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="sr"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="sv"
+    />
+    <subtype
+            android:label="@string/subtype_generic"
+            android:subtypeLocale="tr"
     />
 </spell-checker>