diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index a7970570..93c18be6 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -3006,15 +3006,17 @@
       <packagereq type="optional">graphviz</packagereq>
       <packagereq type="optional">gutenprint-plugin</packagereq>
       <packagereq type="optional">gv</packagereq>
+      <packagereq type="optional">gwenview</packagereq>
       <packagereq type="optional">hugin</packagereq>
       <packagereq type="optional">ImageMagick</packagereq>
       <packagereq type="optional">inkscape</packagereq>
       <packagereq type="optional">ipe</packagereq>
       <packagereq type="optional">k3d</packagereq>
-      <packagereq type="optional">kdegraphics</packagereq>
       <packagereq type="optional">kipi-plugins</packagereq>
       <packagereq type="optional">koffice-krita</packagereq>
+      <packagereq type="optional">kolourpaint</packagereq>
       <packagereq type="optional">kphotoalbum</packagereq>
+      <packagereq type="optional">ksnapshot</packagereq>
       <packagereq type="optional">makehuman</packagereq>
       <packagereq type="optional">mirage</packagereq>
       <packagereq type="optional">netpbm-progs</packagereq>
@@ -3664,10 +3666,13 @@
       <packagereq type="default">dejavu-sans-mono-fonts</packagereq>
       <packagereq type="default">dejavu-serif-fonts</packagereq>
       <packagereq type="default">digikam</packagereq>
+      <packagereq type="default">gwenview</packagereq>
       <packagereq type="default">k3b</packagereq>
+      <packagereq type="default">kamera</packagereq>
       <packagereq type="default">kamoso</packagereq>
       <packagereq type="default">kcalc</packagereq>
       <packagereq type="default">kcharselect</packagereq>
+      <packagereq type="default">kcolorchooser</packagereq>
       <packagereq type="default">kcm-gtk</packagereq>
       <packagereq type="default">kcm_touchpad</packagereq>
       <packagereq type="default">kde-plasma-networkmanagement</packagereq>
@@ -3680,7 +3685,8 @@
       <packagereq type="default">kdeartwork-screensavers</packagereq>
       <packagereq type="default">kde-baseapps</packagereq>
       <packagereq type="default">kdegames</packagereq>
-      <packagereq type="default">kdegraphics</packagereq>
+      <packagereq type="default">kdegraphics-strigi-analyzer</packagereq>
+      <packagereq type="default">kdegraphics-thumbnailers</packagereq>
       <packagereq type="default">kdemultimedia-dragonplayer</packagereq>
       <packagereq type="default">kdemultimedia-kmix</packagereq>
       <packagereq type="default">kdenetwork-kdnssd</packagereq>
@@ -3692,18 +3698,23 @@
       <packagereq type="default">kdm</packagereq>
       <packagereq type="default">kgpg</packagereq>
       <packagereq type="default">kipi-plugins</packagereq>
+      <packagereq type="default">kolourpaint</packagereq>
       <packagereq type="default">konq-plugins</packagereq>
       <packagereq type="default">konversation</packagereq>
+      <packagereq type="default">kruler</packagereq>
       <packagereq type="default">krusader</packagereq>
+      <packagereq type="default">ksnapshot</packagereq>
       <packagereq type="default">ksshaskpass</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">kwallet</packagereq>
       <packagereq type="default">kwebkitpart</packagereq>
+      <packagereq type="default">okular</packagereq>
       <packagereq type="default">oxygen-gtk</packagereq>
       <packagereq type="default">PackageKit-gstreamer-plugin</packagereq>
       <packagereq type="default">phonon-backend-gstreamer</packagereq>
       <packagereq type="default">plasma-scriptengine-python</packagereq>
       <packagereq type="default">scribus</packagereq>
+      <packagereq type="default">svnpart</packagereq>
       <packagereq type="default">system-config-date</packagereq>
       <packagereq type="default">system-config-firewall</packagereq>
       <packagereq type="default">system-config-printer-kde</packagereq>
@@ -3753,6 +3764,7 @@
       <packagereq type="optional">kdetoys</packagereq>
       <packagereq type="optional">kdissert</packagereq>
       <packagereq type="optional">kfloppy</packagereq>
+      <packagereq type="optional">kgamma</packagereq>
       <packagereq type="optional">kgrab</packagereq>
       <packagereq type="optional">kiconedit</packagereq>
       <packagereq type="optional">kio-ftps</packagereq>
@@ -3768,6 +3780,7 @@
       <packagereq type="optional">koverartist</packagereq>
       <packagereq type="optional">krecipes</packagereq>
       <packagereq type="optional">krename</packagereq>
+      <packagereq type="optional">ksaneplugin</packagereq>
       <packagereq type="optional">ksensors</packagereq>
       <packagereq type="optional">kshutdown</packagereq>
       <packagereq type="optional">ksig</packagereq>
@@ -4750,6 +4763,7 @@
       <packagereq type="optional">lyx</packagereq>
       <packagereq type="optional">MagicPoint</packagereq>
       <packagereq type="optional">notecase</packagereq>
+      <packagereq type="optional">okular</packagereq>
       <packagereq type="optional">openoffice.org-ooolatex</packagereq>
       <packagereq type="optional">libreoffice-voikko</packagereq>
       <packagereq type="optional">pybliographer</packagereq>