diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 81cc34c2..2c2a5b3f 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -2982,8 +2982,8 @@
       <packagereq type="default">ghc-haskell-platform-devel</packagereq>
       <packagereq type="default">ghc-hamlet-devel</packagereq>
       <packagereq type="default">ghc-hlint-devel</packagereq>
+      <packagereq type="default">ghc-hakyll-devel</packagereq>
       <packagereq type="default">ghc-leksah-devel</packagereq>
-      <packagereq type="default">ghc-pandoc-devel</packagereq>
       <packagereq type="default">ghc-regexpr-devel</packagereq>
       <packagereq type="default">ghc-rpm-macros</packagereq>
       <packagereq type="default">ghc-xmonad-contrib-devel</packagereq>
@@ -2993,9 +2993,9 @@
       <packagereq type="default">hlint</packagereq>
       <packagereq type="default">hscolour</packagereq>
       <packagereq type="optional">cpphs</packagereq>
-      <packagereq type="optional">ghc-chalmers-lava2000-devel</packagereq>
       <packagereq type="optional">hugs98</packagereq>
       <packagereq type="optional">hugs98-demos</packagereq>
+      <packagereq type="optional">leksah</packagereq>
       <packagereq type="optional">xmobar</packagereq>
       <packagereq type="optional">xmonad</packagereq>
     </packagelist>