diff --git a/comps-f11.xml.in b/comps-f11.xml.in
index 5e9e01c6..799c4162 100644
--- a/comps-f11.xml.in
+++ b/comps-f11.xml.in
@@ -126,8 +126,8 @@
lohit-fonts-bengali
m17n-contrib-assamese
m17n-db-assamese
- openoffice.org-langpack-as_IN
ibus-m17n
+ openoffice.org-langpack-as_IN
iok
@@ -423,10 +423,10 @@
m17n-db-bengali
aspell-bn
hunspell-bn
+ ibus-m17n
kde-i18n-Bengali
moodle-bn
openoffice.org-langpack-bn
- ibus-m17n
iok
@@ -592,6 +592,9 @@
cjkunifonts-uming
eclipse-nls-zh
eclipse-nls-zh_TW
+ ibus-chewing
+ ibus-pinyin
+ ibus-table-chinese
kde-i18n-Chinese
kde-i18n-Chinese-Big5
kde-l10n-Chinese
@@ -602,9 +605,6 @@
moodle-zh_tw
openoffice.org-langpack-zh_CN
openoffice.org-langpack-zh_TW
- ibus-chewing
- ibus-pinyin
- ibus-table-chinese
taipeifonts
wqy-bitmap-fonts
gcin
@@ -2418,9 +2418,9 @@
m17n-db-gujarati
aspell-gu
hunspell-gu
+ ibus-m17n
moodle-gu
openoffice.org-langpack-gu_IN
- ibus-m17n
iok
samyak-fonts-gujarati
@@ -2533,11 +2533,11 @@
aspell-hi
gcompris-sound-hi
hunspell-hi
+ ibus-m17n
kde-i18n-Hindi
kde-l10n-Hindi
moodle-hi
openoffice.org-langpack-hi_IN
- ibus-m17n
iok
samyak-fonts-devanagari
sarai-fonts
@@ -2600,9 +2600,9 @@
true
true
- imsettings-xfce
ibus-gtk
ibus-qt
+ imsettings-xfce
ibus-anthy
ibus-chewing
ibus-hangul
@@ -2770,13 +2770,13 @@
VLGothic-fonts
eclipse-nls-ja
+ ibus-anthy
kde-i18n-Japanese
kde-l10n-Japanese
koffice-langpack-ja
man-pages-ja
moodle-ja
openoffice.org-langpack-ja_JP
- ibus-anthy
uim-anthy
japanese-bitmap-fonts
sazanami-fonts-gothic
@@ -2789,7 +2789,6 @@
eblook
ebview
hanazono-fonts
- ibus-anthy
jfbterm
jisksp16-1990-fonts
kcc
@@ -2969,9 +2968,9 @@
lohit-fonts-kannada
m17n-contrib-kannada
m17n-db-kannada
+ ibus-m17n
moodle-kn
openoffice.org-langpack-kn_IN
- ibus-m17n
iok
@@ -3186,12 +3185,12 @@
un-core-fonts-dotum
eclipse-nls-ko
+ ibus-hangul
kde-i18n-Korean
kde-l10n-Korean
man-pages-ko
moodle-ko
openoffice.org-langpack-ko_KR
- ibus-hangul
baekmuk-bdf-fonts
baekmuk-ttf-fonts-batang
baekmuk-ttf-fonts-dotum
@@ -3214,7 +3213,6 @@
un-extra-fonts-taza
un-extra-fonts-vada
un-extra-fonts-yetgul
- ibus-hangul
lv
m17n-db-korean
nabi
@@ -3514,9 +3512,9 @@
m17n-db-malayalam
aspell-ml
hunspell-ml
+ ibus-m17n
moodle-ml
openoffice.org-langpack-ml_IN
- ibus-m17n
iok
lohit-fonts-malayalam
samyak-fonts-malayalam
@@ -3555,8 +3553,8 @@
aspell-mr
gcompris-sound-mr
hunspell-mr
- openoffice.org-langpack-mr_IN
ibus-m17n
+ openoffice.org-langpack-mr_IN
iok
samyak-fonts-devanagari
@@ -3608,9 +3606,9 @@
m17n-contrib-nepali
madan-fonts
hunspell-ne
+ ibus-m17n
kde-l10n-Nepali
koffice-langpack-ne
- ibus-m17n
scim-tables-nepali
@@ -3828,8 +3826,8 @@
m17n-db-oriya
aspell-or
hunspell-or
- openoffice.org-langpack-or_IN
ibus-m17n
+ openoffice.org-langpack-or_IN
iok
samyak-fonts-oriya
@@ -3926,10 +3924,10 @@
m17n-db-punjabi
aspell-pa
hunspell-pa
+ ibus-m17n
kde-i18n-Punjabi
kde-l10n-Punjabi
openoffice.org-langpack-pa_IN
- ibus-m17n
iok
@@ -4072,8 +4070,8 @@
lklug-fonts
m17n-contrib-sinhala
m17n-db-sinhala
- moodle-si
ibus-m17n
+ moodle-si
scim-sayura
@@ -4619,12 +4617,12 @@
m17n-db-tamil
aspell-ta
hunspell-ta
+ ibus-m17n
kde-i18n-Tamil
kde-l10n-Tamil
moodle-ta
moodle-ta_lk
openoffice.org-langpack-ta_IN
- ibus-m17n
iok
samyak-fonts-tamil
serafettin-cartoon-fonts
@@ -4643,8 +4641,8 @@
m17n-db-telugu
aspell-te
hunspell-te
- openoffice.org-langpack-te_IN
ibus-m17n
+ openoffice.org-langpack-te_IN
iok
@@ -4705,10 +4703,10 @@
m17n-db-thai
thaifonts-scalable
hunspell-th
+ ibus-m17n
kde-l10n-Thai
moodle-th
openoffice.org-langpack-th_TH
- ibus-m17n
scim-tables-thai