diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index d98d6532..f05ddf48 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -400,7 +400,6 @@
       <packagereq type="default">xorg-x11-utils</packagereq>
       <packagereq type="optional">alltray</packagereq>
       <packagereq type="optional">aterm</packagereq>
-      <packagereq type="optional">bitmap-fonts</packagereq>
       <packagereq type="optional">devilspie</packagereq>
       <packagereq type="optional">gdm</packagereq>
       <packagereq type="optional">gxmessage</packagereq>
@@ -3259,10 +3258,12 @@
       <packagereq type="default">ghc-editline-devel</packagereq>
       <packagereq type="default">ghc-ghc-devel</packagereq>
       <packagereq type="default">ghc-ghc-paths-devel</packagereq>
+      <packagereq type="default">ghc-gtk-devel</packagereq>
       <packagereq type="default">ghc-haskell-platform-devel</packagereq>
       <packagereq type="default">ghc-hlint-devel</packagereq>
       <packagereq type="default">ghc-tar-devel</packagereq>
       <packagereq type="default">ghc-xmonad-contrib-devel</packagereq>
+      <packagereq type="default">gtk2hs-buildtools</packagereq>
       <packagereq type="default">happy</packagereq>
       <packagereq type="default">haskell-platform</packagereq>
       <packagereq type="default">hlint</packagereq>
@@ -3273,6 +3274,7 @@
       <packagereq type="optional">ghc-prof</packagereq>
       <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
+      <packagereq type="optional">xmobar</packagereq>
       <packagereq type="optional">xmonad</packagereq>
     </packagelist>
   </group>
@@ -3405,6 +3407,7 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="conditional" requires="gtk2">gtk2-immodule-xim</packagereq>
+      <packagereq type="conditional" requires="gtk3">gtk3-immodule-xim</packagereq>
       <packagereq type="conditional" requires="gtk2">ibus-gtk2</packagereq>
       <packagereq type="conditional" requires="gtk3">ibus-gtk3</packagereq>
       <packagereq type="conditional" requires="qt">ibus-qt</packagereq>
@@ -3421,11 +3424,17 @@
       <packagereq type="default">m17n-contrib</packagereq>
       <packagereq type="default">m17n-db</packagereq>
       <packagereq type="optional">cellwriter</packagereq>
+      <packagereq type="optional">eekboard</packagereq>
       <packagereq type="optional">fcitx</packagereq>
       <packagereq type="optional">gcin</packagereq>
       <packagereq type="optional">gok</packagereq>
+      <packagereq type="optional">ibus-fbterm</packagereq>
+      <packagereq type="optional">ibus-handwrite</packagereq>
+      <packagereq type="optional">ibus-input-pad</packagereq>
       <packagereq type="optional">ibus-mozc</packagereq>
+      <packagereq type="optional">ibus-pinyin-db-android</packagereq>
       <packagereq type="optional">ibus-sayura</packagereq>
+      <packagereq type="optional">ibus-skk</packagereq>
       <packagereq type="optional">ibus-sunpinyin</packagereq>
       <packagereq type="optional">ibus-table</packagereq>
       <packagereq type="optional">ibus-table-array30</packagereq>
@@ -3434,6 +3443,7 @@
       <packagereq type="optional">ibus-table-xingma</packagereq>
       <packagereq type="optional">ibus-table-yinma</packagereq>
       <packagereq type="optional">ibus-xkbc</packagereq>
+      <packagereq type="optional">input-pad</packagereq>
       <packagereq type="optional">iok</packagereq>
       <packagereq type="optional">kinput2</packagereq>
       <packagereq type="optional">nabi</packagereq>
@@ -3446,6 +3456,7 @@
       <packagereq type="optional">scim-fcitx</packagereq>
       <packagereq type="optional">scim-gtk</packagereq>
       <packagereq type="optional">scim-hangul</packagereq>
+      <packagereq type="optional">scim-input-pad</packagereq>
       <packagereq type="optional">scim-m17n</packagereq>
       <packagereq type="optional">scim-mozc</packagereq>
       <packagereq type="optional">scim-pinyin</packagereq>
@@ -3458,9 +3469,11 @@
       <packagereq type="optional">scim-python-xingma-zhengma</packagereq>
       <packagereq type="optional">scim-rawcode</packagereq>
       <packagereq type="optional">scim-sayura</packagereq>
+      <packagereq type="optional">scim-skk</packagereq>
       <packagereq type="optional">scim-tables-additional</packagereq>
       <packagereq type="optional">scim-tables-chinese</packagereq>
       <packagereq type="optional">scim-tables-chinese-extra</packagereq>
+      <packagereq type="optional">scim-thai</packagereq>
       <packagereq type="optional">scim-tomoe</packagereq>
       <packagereq type="optional">uim</packagereq>
       <packagereq type="optional">uim-anthy</packagereq>
@@ -4155,8 +4168,10 @@
       <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-console-fonts</packagereq>
       <packagereq type="optional">bitmap-fangsongti-fonts</packagereq>
-      <packagereq type="optional">bitmap-fonts</packagereq>
+      <packagereq type="optional">bitmap-fixed-fonts</packagereq>
+      <packagereq type="optional">bitmap-lucida-typewriter-fonts</packagereq>
       <packagereq type="optional">ctan-musixtex-fonts</packagereq>
       <packagereq type="optional">culmus-aharoni-clm-fonts</packagereq>
       <packagereq type="optional">culmus-caladings-clm-fonts</packagereq>
@@ -4190,6 +4205,7 @@
       <packagereq type="optional">taipeifonts</packagereq>
       <packagereq type="optional">terminus-fonts</packagereq>
       <packagereq type="optional">terminus-fonts-console</packagereq>
+      <packagereq type="optional">ucs-miscfixed-fonts</packagereq>
       <packagereq type="optional">urw-fonts</packagereq>
       <packagereq type="optional">wqy-bitmap-fonts</packagereq>
       <packagereq type="optional">wqy-unibit-fonts</packagereq>
@@ -5932,6 +5948,7 @@
       <packagereq type="optional">wlassistant</packagereq>
       <packagereq type="optional">w_scan</packagereq>
       <packagereq type="optional">x3270-x11</packagereq>
+      <packagereq type="optional">xmobar</packagereq>
       <packagereq type="optional">xsel</packagereq>
       <packagereq type="optional">xsupplicant</packagereq>
       <packagereq type="optional">zidrav</packagereq>