diff --git a/comps-f9.xml.in b/comps-f9.xml.in
index f90a7f51..44d1675b 100644
--- a/comps-f9.xml.in
+++ b/comps-f9.xml.in
@@ -304,30 +304,14 @@
       <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">gdm</packagereq>
       <packagereq type="default">glx-utils</packagereq>
-      <packagereq type="default">jomolhari-fonts</packagereq>
-      <packagereq type="default">kacst-fonts</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
-      <packagereq type="default">liberation-fonts</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-oriya</packagereq>
-      <packagereq type="default">lohit-fonts-punjabi</packagereq>
-      <packagereq type="default">lohit-fonts-tamil</packagereq>
-      <packagereq type="default">lohit-fonts-telugu</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
-      <packagereq type="default">paktype-fonts</packagereq>
       <packagereq type="default">pirut</packagereq>
       <packagereq type="default">policycoreutils-gui</packagereq>
       <packagereq type="default">rhgb</packagereq>
-      <packagereq type="default">sazanami-fonts-gothic</packagereq>
       <packagereq type="default">setroubleshoot</packagereq>
       <packagereq type="default">smolt-firstboot</packagereq>
       <packagereq type="default">system-config-date</packagereq>
@@ -343,17 +327,11 @@
       <packagereq type="default">xterm</packagereq>
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
-      <packagereq type="optional">bitstream-vera-fonts</packagereq>
-      <packagereq type="optional">dejavu-fonts</packagereq>
-      <packagereq type="optional">dejavu-fonts-experimental</packagereq>
       <packagereq type="optional">devilspie</packagereq>
-      <packagereq type="optional">fonts-japanese</packagereq>
-      <packagereq type="optional">freefont</packagereq>
       <packagereq type="optional">lineak-defaultplugin</packagereq>
       <packagereq type="optional">lineak-xosdplugin</packagereq>
       <packagereq type="optional">lineakd</packagereq>
       <packagereq type="optional">lxpanel</packagereq>
-      <packagereq type="optional">mathml-fonts</packagereq>
       <packagereq type="optional">rss-glx</packagereq>
       <packagereq type="optional">rss-glx-xscreensaver</packagereq>
       <packagereq type="optional">rxvt</packagereq>
@@ -362,12 +340,9 @@
       <packagereq type="optional">uim-m17n</packagereq>
       <packagereq type="optional">vnc-server</packagereq>
       <packagereq type="optional">workrave</packagereq>
-      <packagereq type="optional">wqy-bitmap-fonts</packagereq>
       <packagereq type="optional">xdaliclock</packagereq>
       <packagereq type="optional">xkeycaps</packagereq>
       <packagereq type="optional">xlockmore</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
-      <packagereq type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-resutils</packagereq>
       <packagereq type="optional">xorg-x11-server-Xnest</packagereq>
       <packagereq type="optional">xorg-x11-server-Xvfb</packagereq>
@@ -391,6 +366,7 @@
       <packagereq type="default">cjkunifonts-uming</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
+      <packagereq type="default">kacst-fonts</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">lklug-fonts</packagereq>
       <packagereq type="default">lohit-fonts-bengali</packagereq>
@@ -402,6 +378,7 @@
       <packagereq type="default">lohit-fonts-punjabi</packagereq>
       <packagereq type="default">lohit-fonts-tamil</packagereq>
       <packagereq type="default">lohit-fonts-telugu</packagereq>
+      <packagereq type="default">paktype-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>
@@ -463,6 +440,8 @@
       <packagereq type="optional">terminus-font-console</packagereq>
       <packagereq type="optional">terminus-font-x11</packagereq>
       <packagereq type="optional">urw-fonts</packagereq>
+      <packagereq type="optional">wqy-bitmap-fonts</packagereq>
+      <packagereq type="optional">wqy-unibit-fonts</packagereq>
       <packagereq type="optional">xorg-x11-fonts-75dpi</packagereq>
       <packagereq type="optional">xorg-x11-fonts-cyrillic</packagereq>
       <packagereq type="optional">xorg-x11-fonts-ISO8859-1-75dpi</packagereq>