diff --git a/comps-f11.xml.in b/comps-f11.xml.in
index 09e6733c..c5e9d953 100644
--- a/comps-f11.xml.in
+++ b/comps-f11.xml.in
@@ -1498,7 +1498,7 @@
       <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="default">smc-fonts-meera</packagereq>
       <packagereq type="default">stix-fonts</packagereq>
-      <packagereq type="default">thaifonts-scalable</packagereq>
+      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="default">un-core-fonts-dotum</packagereq>
       <packagereq type="default">VLGothic-fonts</packagereq>
       <packagereq type="optional">apanov-edrip-fonts</packagereq>
@@ -4760,7 +4760,18 @@
     <langonly>th</langonly>
     <packagelist>
       <packagereq type="mandatory">m17n-db-thai</packagereq>
-      <packagereq type="mandatory">thaifonts-scalable</packagereq>
+      <packagereq type="default">thai-scalable-garuda-fonts</packagereq>
+      <packagereq type="default">thai-scalable-kinnari-fonts</packagereq>
+      <packagereq type="default">thai-scalable-loma-fonts</packagereq>
+      <packagereq type="default">thai-scalable-norasi-fonts</packagereq>
+      <packagereq type="default">thai-scalable-purisa-fonts</packagereq>
+      <packagereq type="default">thai-scalable-sawasdee-fonts</packagereq>
+      <packagereq type="default">thai-scalable-tlwgmono-fonts</packagereq>
+      <packagereq type="default">thai-scalable-tlwgtypewriter-fonts</packagereq>
+      <packagereq type="default">thai-scalable-tlwgtypist-fonts</packagereq>
+      <packagereq type="default">thai-scalable-tlwgtypo-fonts</packagereq>
+      <packagereq type="default">thai-scalable-umpush-fonts</packagereq>
+      <packagereq type="default">thai-scalable-waree-fonts</packagereq>
       <packagereq type="conditional" requires="hunspell">hunspell-th</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">ibus-m17n</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Thai</packagereq>