diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 2a00be4f..69d4fff4 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -2756,11 +2756,7 @@
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
       <packagereq type="optional">pagul-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-farsi-fonts</packagereq>
       <packagereq type="optional">paktype-naskh-basic-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sa-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sindhi-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-urdu-fonts</packagereq>
       <packagereq type="optional">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
@@ -4971,7 +4967,7 @@
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib</packagereq>
-      <packagereq type="mandatory">paktype-naskh-basic-sindhi-fonts</packagereq>
+      <packagereq type="mandatory">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -5617,11 +5613,7 @@
       <packagereq type="optional">nafees-riqa-fonts</packagereq>
       <packagereq type="optional">nafees-tehreer-naskh-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-farsi-fonts</packagereq>
       <packagereq type="optional">paktype-naskh-basic-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sa-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sindhi-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-urdu-fonts</packagereq>
     </packagelist>
   </group>
   <group>
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index e25699f7..c15374a1 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -2754,11 +2754,7 @@
       <packagereq type="optional">oldstandard-sfd-fonts</packagereq>
       <packagereq type="optional">pagul-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-farsi-fonts</packagereq>
       <packagereq type="optional">paktype-naskh-basic-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sa-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sindhi-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-urdu-fonts</packagereq>
       <packagereq type="optional">paktype-tehreer-fonts</packagereq>
       <packagereq type="optional">paratype-pt-sans-caption-fonts</packagereq>
       <packagereq type="optional">pothana2000-fonts</packagereq>
@@ -5088,7 +5084,7 @@
     <packagelist>
       <packagereq type="mandatory">lohit-devanagari-fonts</packagereq>
       <packagereq type="mandatory">m17n-contrib</packagereq>
-      <packagereq type="mandatory">paktype-naskh-basic-sindhi-fonts</packagereq>
+      <packagereq type="mandatory">paktype-naskh-basic-fonts</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="default">iok</packagereq>
     </packagelist>
@@ -5734,11 +5730,7 @@
       <packagereq type="optional">nafees-riqa-fonts</packagereq>
       <packagereq type="optional">nafees-tehreer-naskh-fonts</packagereq>
       <packagereq type="optional">paktype-ajrak-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-farsi-fonts</packagereq>
       <packagereq type="optional">paktype-naskh-basic-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sa-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-sindhi-fonts</packagereq>
-      <packagereq type="optional">paktype-naskh-basic-urdu-fonts</packagereq>
     </packagelist>
   </group>
   <group>