diff --git a/comps-f8.xml.in b/comps-f8.xml.in
index 77992262..ebefffaa 100644
--- a/comps-f8.xml.in
+++ b/comps-f8.xml.in
@@ -308,21 +308,21 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">gdm</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
@@ -355,6 +355,7 @@
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
@@ -392,23 +393,26 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-malayalam</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-malayalam</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-batang</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-dotum</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-hline</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
@@ -417,6 +421,7 @@
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">gentium-fonts</packagereq>
@@ -446,6 +451,7 @@
       <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
       <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
+      <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
       <packagereq type="optional">bitmap-fonts-cjk</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>
diff --git a/comps-f9.xml.in b/comps-f9.xml.in
index 77992262..ebefffaa 100644
--- a/comps-f9.xml.in
+++ b/comps-f9.xml.in
@@ -308,21 +308,21 @@
       <packagereq type="mandatory">xorg-x11-xauth</packagereq>
       <packagereq type="mandatory">xorg-x11-xinit</packagereq>
       <packagereq type="default">authconfig-gtk</packagereq>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
       <packagereq type="default">fonts-hebrew</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">gdm</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
@@ -355,6 +355,7 @@
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
@@ -392,23 +393,26 @@
     <default>true</default>
     <uservisible>true</uservisible>
     <packagelist>
+      <packagereq type="default">baekmuk-ttf-fonts-gulim</packagereq>
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">fonts-arabic</packagereq>
-      <packagereq type="default">fonts-bengali</packagereq>
-      <packagereq type="default">fonts-gujarati</packagereq>
-      <packagereq type="default">fonts-hindi</packagereq>
-      <packagereq type="default">fonts-kannada</packagereq>
-      <packagereq type="default">fonts-korean</packagereq>
-      <packagereq type="default">fonts-malayalam</packagereq>
-      <packagereq type="default">fonts-oriya</packagereq>
-      <packagereq type="default">fonts-punjabi</packagereq>
+      <packagereq type="default">lohit-fonts-bengali</packagereq>
+      <packagereq type="default">lohit-fonts-gujarati</packagereq>
+      <packagereq type="default">lohit-fonts-hindi</packagereq>
+      <packagereq type="default">lohit-fonts-kannada</packagereq>
+      <packagereq type="default">lohit-fonts-malayalam</packagereq>
+      <packagereq type="default">lohit-fonts-oriya</packagereq>
+      <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">fonts-sinhala</packagereq>
-      <packagereq type="default">fonts-tamil</packagereq>
-      <packagereq type="default">fonts-telugu</packagereq>
+      <packagereq type="default">lohit-fonts-tamil</packagereq>
+      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-batang</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-dotum</packagereq>
+      <packagereq type="optional">baekmuk-ttf-fonts-hline</packagereq>
       <packagereq type="optional">bitstream-vera-fonts</packagereq>
       <packagereq type="optional">charis-fonts</packagereq>
       <packagereq type="optional">cjkunifonts-ukai</packagereq>
@@ -417,6 +421,7 @@
       <packagereq type="optional">doulos-fonts</packagereq>
       <packagereq type="optional">fonts-chinese</packagereq>
       <packagereq type="optional">fonts-japanese</packagereq>
+      <packagereq type="optional">fonts-korean</packagereq>
       <packagereq type="optional">fonts-truetype-apl</packagereq>
       <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">gentium-fonts</packagereq>
@@ -446,6 +451,7 @@
       <packagereq type="default">xorg-x11-fonts-truetype</packagereq>
       <packagereq type="default">xorg-x11-fonts-Type1</packagereq>
       <packagereq type="optional">artwiz-aleczapka-fonts</packagereq>
+      <packagereq type="optional">baekmuk-bdf-fonts</packagereq>
       <packagereq type="optional">bitmap-fonts-cjk</packagereq>
       <packagereq type="optional">efont-unicode-bdf</packagereq>
       <packagereq type="optional">fonts-hebrew-fancy</packagereq>