diff --git a/comps-f13.xml.in b/comps-f13.xml.in
index ba492476..921d8263 100644
--- a/comps-f13.xml.in
+++ b/comps-f13.xml.in
@@ -1849,10 +1849,8 @@
       <packagereq type="default">lohit-assamese-fonts</packagereq>
       <packagereq type="default">lohit-bengali-fonts</packagereq>
       <packagereq type="default">lohit-gujarati-fonts</packagereq>
-      <packagereq type="default">lohit-hindi-fonts</packagereq>
+      <packagereq type="default">lohit-devanagari-fonts</packagereq>
       <packagereq type="default">lohit-kannada-fonts</packagereq>
-      <packagereq type="default">lohit-maithili-fonts</packagereq>
-      <packagereq type="default">lohit-marathi-fonts</packagereq>
       <packagereq type="default">lohit-oriya-fonts</packagereq>
       <packagereq type="default">lohit-punjabi-fonts</packagereq>
       <packagereq type="default">lohit-tamil-fonts</packagereq>
@@ -1995,11 +1993,7 @@
       <packagereq type="optional">lilypond-feta-fonts</packagereq>
       <packagereq type="optional">lilypond-parmesan-fonts</packagereq>
       <packagereq type="optional">linux-libertine-fonts</packagereq>
-      <packagereq type="optional">lohit-kashmiri-fonts</packagereq>
-      <packagereq type="optional">lohit-konkani-fonts</packagereq>
       <packagereq type="optional">lohit-malayalam-fonts</packagereq>
-      <packagereq type="optional">lohit-nepali-fonts</packagereq>
-      <packagereq type="optional">lohit-sindhi-fonts</packagereq>
       <packagereq type="optional">madan-fonts</packagereq>
       <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">mgopen-canonica-fonts</packagereq>
@@ -3165,7 +3159,7 @@
     <uservisible>true</uservisible>
     <langonly>hi</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-hindi-fonts</packagereq>
+      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-hindi</packagereq>
       <packagereq type="mandatory">m17n-db-hindi</packagereq>
       <packagereq type="conditional" requires="aspell">aspell-hi</packagereq>
@@ -3677,7 +3671,7 @@
     <uservisible>true</uservisible>
     <langonly>ks</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-kashmiri-fonts</packagereq>
+      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-kashmiri</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
@@ -3908,7 +3902,7 @@
     <uservisible>true</uservisible>
     <langonly>kok</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-konkani-fonts</packagereq>
+      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -4264,7 +4258,7 @@
     <uservisible>true</uservisible>
     <langonly>mai</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-maithili-fonts</packagereq>
+      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-maithili</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-mai</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
@@ -4372,7 +4366,7 @@
     <uservisible>true</uservisible>
     <langonly>mr</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-marathi-fonts</packagereq>
+      <packagereq type="mandatory">lohit-devanagari-fonts</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>
@@ -4505,7 +4499,7 @@
     <uservisible>true</uservisible>
     <langonly>ne</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-nepali-fonts</packagereq>
+      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-nepali</packagereq>
       <packagereq type="mandatory">madan-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-ne</packagereq>
@@ -5079,7 +5073,7 @@
     <uservisible>true</uservisible>
     <langonly>sd</langonly>
     <packagelist>
-      <packagereq type="mandatory">lohit-sindhi-fonts</packagereq>
+      <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib-sindhi</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>