diff --git a/comps-f10.xml.in b/comps-f10.xml.in
index c2477180..6f1b92b5 100644
--- a/comps-f10.xml.in
+++ b/comps-f10.xml.in
@@ -1339,6 +1339,7 @@
       <packagereq type="default">dejavu-fonts-experimental</packagereq>
       <packagereq type="default">jomolhari-fonts</packagereq>
       <packagereq type="default">kacst-fonts</packagereq>
+      <packagereq type="default">khmeros-fonts-base</packagereq>
       <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">lklug-fonts</packagereq>
       <packagereq type="default">lohit-fonts-bengali</packagereq>
@@ -1389,7 +1390,6 @@
       <packagereq type="optional">gfs-theokritos-fonts</packagereq>
       <packagereq type="optional">icelandic-fonts</packagereq>
       <packagereq type="optional">inconsolata-fonts</packagereq>
-      <packagereq type="optional">khmeros-fonts-base</packagereq>
       <packagereq type="optional">khmeros-fonts-battambang</packagereq>
       <packagereq type="optional">khmeros-fonts-bokor</packagereq>
       <packagereq type="optional">khmeros-fonts-handwritten</packagereq>
@@ -2221,6 +2221,33 @@
       <packagereq type="optional">tpb</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>haskell</id>
+    <_name>Haskell</_name>
+    <_description/>
+    <default>false</default>
+    <uservisible>true</uservisible>
+    <packagelist>
+      <packagereq type="default">alex</packagereq>
+      <packagereq type="default">darcs</packagereq>
+      <packagereq type="default">ghc</packagereq>
+      <packagereq type="default">haddock</packagereq>
+      <packagereq type="default">happy</packagereq>
+      <packagereq type="default">hugs98</packagereq>
+      <packagereq type="optional">ghc-doc</packagereq>
+      <packagereq type="optional">ghc-gtk2hs</packagereq>
+      <packagereq type="optional">ghc-haddock</packagereq>
+      <packagereq type="optional">ghc-prof</packagereq>
+      <packagereq type="optional">haddock09</packagereq>
+      <packagereq type="optional">hugs98-alut</packagereq>
+      <packagereq type="optional">hugs98-demos</packagereq>
+      <packagereq type="optional">hugs98-glut</packagereq>
+      <packagereq type="optional">hugs98-hgl</packagereq>
+      <packagereq type="optional">hugs98-openal</packagereq>
+      <packagereq type="optional">hugs98-opengl</packagereq>
+      <packagereq type="optional">hugs98-x11</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>hebrew-support</id>
     <_name>Hebrew Support</_name>
@@ -2490,7 +2517,8 @@
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ja_JP</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-anthy</packagereq>
       <packagereq type="conditional" requires="xorg-x11-server-Xorg">scim-lang-japanese</packagereq>
-      <packagereq type="default">fonts-japanese</packagereq>
+      <packagereq type="conditional" requires="uim">uim-anthy</packagereq>
+      <packagereq type="default">japanese-bitmap-fonts</packagereq>
       <packagereq type="default">sazanami-fonts-gothic</packagereq>
       <packagereq type="default">sazanami-fonts-mincho</packagereq>
       <packagereq type="default">VLGothic-fonts-proportional</packagereq>
@@ -2516,7 +2544,6 @@
       <packagereq type="optional">perl-NKF</packagereq>
       <packagereq type="optional">scim-skk</packagereq>
       <packagereq type="optional">stardict-dic-ja</packagereq>
-      <packagereq type="optional">uim-anthy</packagereq>
       <packagereq type="optional">uim-canna</packagereq>
       <packagereq type="optional">uim-skk</packagereq>
       <packagereq type="optional">wkf</packagereq>
@@ -2820,17 +2847,17 @@
     <uservisible>false</uservisible>
     <langonly>km</langonly>
     <packagelist>
-      <packagereq type="default">khmeros-fonts-base</packagereq>
+      <packagereq type="mandatory">khmeros-fonts-base</packagereq>
       <packagereq type="conditional" requires="kdelibs">kde-l10n-Khmer</packagereq>
       <packagereq type="conditional" requires="koffice-core">koffice-langpack-km</packagereq>
       <packagereq type="conditional" requires="moodle">moodle-km</packagereq>
+      <packagereq type="default">khmeros-fonts-battambang</packagereq>
+      <packagereq type="default">khmeros-fonts-bokor</packagereq>
+      <packagereq type="default">khmeros-fonts-handwritten</packagereq>
+      <packagereq type="default">khmeros-fonts-metalchrieng</packagereq>
+      <packagereq type="default">khmeros-fonts-muol</packagereq>
+      <packagereq type="default">khmeros-fonts-siemreap</packagereq>
       <packagereq type="optional">m17n-db-khmer</packagereq>
-      <packagereq type="optional">khmeros-fonts-battambang</packagereq>
-      <packagereq type="optional">khmeros-fonts-bokor</packagereq>
-      <packagereq type="optional">khmeros-fonts-handwritten</packagereq>
-      <packagereq type="optional">khmeros-fonts-metalchrieng</packagereq>
-      <packagereq type="optional">khmeros-fonts-muol</packagereq>
-      <packagereq type="optional">khmeros-fonts-siemreap</packagereq>
     </packagelist>
   </group>
   <group>
@@ -2906,12 +2933,12 @@
       <packagereq type="optional">fonts-ISO8859-2</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-100dpi</packagereq>
       <packagereq type="optional">fonts-ISO8859-2-75dpi</packagereq>
-      <packagereq type="optional">fonts-japanese</packagereq>
       <packagereq type="optional">fonts-KOI8-R</packagereq>
       <packagereq type="optional">fonts-KOI8-R-100dpi</packagereq>
       <packagereq type="optional">fonts-KOI8-R-75dpi</packagereq>
       <packagereq type="optional">fonts-x11-apl</packagereq>
       <packagereq type="optional">ghostscript-fonts</packagereq>
+      <packagereq type="optional">japanese-bitmap-fonts</packagereq>
       <packagereq type="optional">jisksp16-1990-fonts</packagereq>
       <packagereq type="optional">knm_new-fonts</packagereq>
       <packagereq type="optional">libdockapp-fonts</packagereq>
@@ -4269,8 +4296,8 @@
       <packagereq type="mandatory">paktype-fonts</packagereq>
       <packagereq type="conditional" requires="openoffice.org-core">openoffice.org-langpack-ur</packagereq>
       <packagereq type="default">dejavu-fonts</packagereq>
-      <packagereq type="default">kacst-fonts</packagereq>
       <packagereq type="default">nafees-web-naskh-fonts</packagereq>
+      <packagereq type="optional">kacst-fonts</packagereq>
     </packagelist>
   </group>
   <group>
@@ -4757,6 +4784,7 @@
       <groupid>eclipse</groupid>
       <groupid>fedora-packager</groupid>
       <groupid>gnome-software-development</groupid>
+      <groupid>haskell</groupid>
       <groupid>java-development</groupid>
       <groupid>kde-software-development</groupid>
       <groupid>legacy-software-development</groupid>