diff --git a/comps-f8.xml.in b/comps-f8.xml.in
index 90dbd78d..ead1f01f 100644
--- a/comps-f8.xml.in
+++ b/comps-f8.xml.in
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
   <group>
@@ -99,6 +99,7 @@
     <langonly>as</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-bengali</packagereq>
+      <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-assamese</packagereq>
@@ -415,6 +416,7 @@
     <langonly>bn</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-bengali</packagereq>
+      <packagereq type="mandatory">m17n-contrib-bengali</packagereq>
       <packagereq type="mandatory">m17n-db-bengali</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Bengali</packagereq>
@@ -1831,6 +1833,7 @@
     <langonly>gu</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-gujarati</packagereq>
+      <packagereq type="mandatory">m17n-contrib-gujarati</packagereq>
       <packagereq type="mandatory">m17n-db-gujarati</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-gu</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-gu</packagereq>
@@ -1900,6 +1903,7 @@
     <langonly>hi</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-hindi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-hindi</packagereq>
       <packagereq type="mandatory">m17n-db-hindi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hindi</packagereq>
@@ -2179,6 +2183,7 @@
     <langonly>kn</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-kannada</packagereq>
+      <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
@@ -2482,6 +2487,7 @@
     <langonly>ml</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-malayalam</packagereq>
+      <packagereq type="mandatory">m17n-contrib-malayalam</packagereq>
       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq>
@@ -2508,7 +2514,7 @@
     <langonly>mr</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-hindi</packagereq>
-      <packagereq type="mandatory">m17n-db-marathi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-marathi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>
@@ -2707,6 +2713,7 @@
     <langonly>or</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-oriya</packagereq>
+      <packagereq type="mandatory">m17n-contrib-oriya</packagereq>
       <packagereq type="mandatory">m17n-db-oriya</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq>
@@ -2794,6 +2801,7 @@
     <langonly>pa</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-punjabi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-punjabi</packagereq>
       <packagereq type="mandatory">m17n-db-punjabi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Punjabi</packagereq>
@@ -2851,6 +2859,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
       <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
     </packagelist>
   </group>
@@ -2913,6 +2922,7 @@
     <langonly>si</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-sinhala</packagereq>
+      <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-sinhalese</packagereq>
@@ -3366,6 +3376,7 @@
     <langonly>ta</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-tamil</packagereq>
+      <packagereq type="mandatory">m17n-contrib-tamil</packagereq>
       <packagereq type="mandatory">m17n-db-tamil</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ta</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Tamil</packagereq>
@@ -3383,6 +3394,7 @@
     <langonly>te</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-telugu</packagereq>
+      <packagereq type="mandatory">m17n-contrib-telugu</packagereq>
       <packagereq type="mandatory">m17n-db-telugu</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-te</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
@@ -3538,7 +3550,7 @@
     <langonly>ur</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-arabic</packagereq>
-      <packagereq type="mandatory">m17n-db-urdu</packagereq>
+      <packagereq type="mandatory">m17n-contrib-urdu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
     </packagelist>
   </group>
@@ -3562,6 +3574,7 @@
     <langonly>vi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="moodle">moodle-vi</packagereq>
+      <packagereq type="optional">m17n-contrib-vietnamese</packagereq>
       <packagereq type="optional">m17n-db-vietnamese</packagereq>
     </packagelist>
   </group>
diff --git a/comps-f9.xml.in b/comps-f9.xml.in
index 90dbd78d..ead1f01f 100644
--- a/comps-f9.xml.in
+++ b/comps-f9.xml.in
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
 <comps>
   <group>
@@ -99,6 +99,7 @@
     <langonly>as</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-bengali</packagereq>
+      <packagereq type="mandatory">m17n-contrib-assamese</packagereq>
       <packagereq type="mandatory">m17n-db-assamese</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-as_IN</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-assamese</packagereq>
@@ -415,6 +416,7 @@
     <langonly>bn</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-bengali</packagereq>
+      <packagereq type="mandatory">m17n-contrib-bengali</packagereq>
       <packagereq type="mandatory">m17n-db-bengali</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-bn</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Bengali</packagereq>
@@ -1831,6 +1833,7 @@
     <langonly>gu</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-gujarati</packagereq>
+      <packagereq type="mandatory">m17n-contrib-gujarati</packagereq>
       <packagereq type="mandatory">m17n-db-gujarati</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-gu</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-gu</packagereq>
@@ -1900,6 +1903,7 @@
     <langonly>hi</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-hindi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-hindi</packagereq>
       <packagereq type="mandatory">m17n-db-hindi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Hindi</packagereq>
@@ -2179,6 +2183,7 @@
     <langonly>kn</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-kannada</packagereq>
+      <packagereq type="mandatory">m17n-contrib-kannada</packagereq>
       <packagereq type="mandatory">m17n-db-kannada</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-kn</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-kn_IN</packagereq>
@@ -2482,6 +2487,7 @@
     <langonly>ml</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-malayalam</packagereq>
+      <packagereq type="mandatory">m17n-contrib-malayalam</packagereq>
       <packagereq type="mandatory">m17n-db-malayalam</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-ml</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ml_IN</packagereq>
@@ -2508,7 +2514,7 @@
     <langonly>mr</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-hindi</packagereq>
-      <packagereq type="mandatory">m17n-db-marathi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-marathi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-mr</packagereq>
       <packagereq type="conditional" requires="gcompris">gcompris-sound-mr</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-mr_IN</packagereq>
@@ -2707,6 +2713,7 @@
     <langonly>or</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-oriya</packagereq>
+      <packagereq type="mandatory">m17n-contrib-oriya</packagereq>
       <packagereq type="mandatory">m17n-db-oriya</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-or</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-or_IN</packagereq>
@@ -2794,6 +2801,7 @@
     <langonly>pa</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-punjabi</packagereq>
+      <packagereq type="mandatory">m17n-contrib-punjabi</packagereq>
       <packagereq type="mandatory">m17n-db-punjabi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-pa</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Punjabi</packagereq>
@@ -2851,6 +2859,7 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ru</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">xorg-x11-fonts-cyrillic</packagereq>
       <packagereq type="default">fonts-KOI8-R-75dpi</packagereq>
+      <packagereq type="optional">m17n-contrib-russian</packagereq>
       <packagereq type="optional">m17n-db-russian</packagereq>
     </packagelist>
   </group>
@@ -2913,6 +2922,7 @@
     <langonly>si</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-sinhala</packagereq>
+      <packagereq type="mandatory">m17n-contrib-sinhala</packagereq>
       <packagereq type="mandatory">m17n-db-sinhala</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-si</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-sinhalese</packagereq>
@@ -3366,6 +3376,7 @@
     <langonly>ta</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-tamil</packagereq>
+      <packagereq type="mandatory">m17n-contrib-tamil</packagereq>
       <packagereq type="mandatory">m17n-db-tamil</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-ta</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-i18n-Tamil</packagereq>
@@ -3383,6 +3394,7 @@
     <langonly>te</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-telugu</packagereq>
+      <packagereq type="mandatory">m17n-contrib-telugu</packagereq>
       <packagereq type="mandatory">m17n-db-telugu</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-te</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-te_IN</packagereq>
@@ -3538,7 +3550,7 @@
     <langonly>ur</langonly>
     <packagelist>
       <packagereq type="mandatory">fonts-arabic</packagereq>
-      <packagereq type="mandatory">m17n-db-urdu</packagereq>
+      <packagereq type="mandatory">m17n-contrib-urdu</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
     </packagelist>
   </group>
@@ -3562,6 +3574,7 @@
     <langonly>vi</langonly>
     <packagelist>
       <packagereq type="conditional" requires="moodle">moodle-vi</packagereq>
+      <packagereq type="optional">m17n-contrib-vietnamese</packagereq>
       <packagereq type="optional">m17n-db-vietnamese</packagereq>
     </packagelist>
   </group>