diff --git a/comps-f15.xml.in b/comps-f15.xml.in
index 3e180f3d..abb40f64 100644
--- a/comps-f15.xml.in
+++ b/comps-f15.xml.in
@@ -1010,11 +1010,10 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
-      <packagereq type="optional">cvc3-devel</packagereq>
       <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
+      <packagereq type="optional">libedit-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
-      <packagereq type="optional">mona-devel</packagereq>
       <packagereq type="optional">poco-devel</packagereq>
       <packagereq type="optional">poco-doc</packagereq>
     </packagelist>
@@ -1077,6 +1076,7 @@
       <packagereq type="optional">asa</packagereq>
       <packagereq type="optional">astyle</packagereq>
       <packagereq type="optional">bigloo</packagereq>
+      <packagereq type="optional">bigloo-doc</packagereq>
       <packagereq type="optional">bugzilla</packagereq>
       <packagereq type="optional">buildbot</packagereq>
       <packagereq type="optional">bzr</packagereq>
@@ -1113,6 +1113,7 @@
       <packagereq type="optional">ecl</packagereq>
       <packagereq type="optional">ElectricFence</packagereq>
       <packagereq type="optional">elfinfo</packagereq>
+      <packagereq type="optional">emacs-bigloo</packagereq>
       <packagereq type="optional">email2trac</packagereq>
       <packagereq type="optional">epydoc</packagereq>
       <packagereq type="optional">eric</packagereq>
@@ -1187,6 +1188,7 @@
       <packagereq type="optional">plague</packagereq>
       <packagereq type="optional">plague-client</packagereq>
       <packagereq type="optional">polyml</packagereq>
+      <packagereq type="optional">polyml-doc</packagereq>
       <packagereq type="optional">pscan</packagereq>
       <packagereq type="optional">pungi</packagereq>
       <packagereq type="optional">pylint</packagereq>
@@ -1401,6 +1403,7 @@
       <packagereq type="optional">xemacs</packagereq>
       <packagereq type="optional">xemacs-ess</packagereq>
       <packagereq type="optional">xemacs-muse</packagereq>
+      <packagereq type="optional">xemacs-packages-base</packagereq>
       <packagereq type="optional">xemacs-packages-extra</packagereq>
       <packagereq type="optional">xmlcopyeditor</packagereq>
       <packagereq type="optional">zile</packagereq>
@@ -1579,7 +1582,16 @@
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">chemtool</packagereq>
+      <packagereq type="optional">coq</packagereq>
+      <packagereq type="optional">coq-coqide</packagereq>
+      <packagereq type="optional">coq-doc</packagereq>
+      <packagereq type="optional">coq-emacs</packagereq>
+      <packagereq type="optional">coq-xemacs</packagereq>
+      <packagereq type="optional">csisat</packagereq>
+      <packagereq type="optional">cudd</packagereq>
+      <packagereq type="optional">cudd-devel</packagereq>
       <packagereq type="optional">cvc3</packagereq>
+      <packagereq type="optional">cvc3-devel</packagereq>
       <packagereq type="optional">cvc3-doc</packagereq>
       <packagereq type="optional">cvc3-emacs</packagereq>
       <packagereq type="optional">cvc3-xemacs</packagereq>
@@ -1624,6 +1636,7 @@
       <packagereq type="optional">maxima</packagereq>
       <packagereq type="optional">maxima-gui</packagereq>
       <packagereq type="optional">mona</packagereq>
+      <packagereq type="optional">mona-devel</packagereq>
       <packagereq type="optional">mona-emacs</packagereq>
       <packagereq type="optional">mona-examples</packagereq>
       <packagereq type="optional">mona-xemacs</packagereq>
@@ -1639,6 +1652,8 @@
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">perl-bioperl</packagereq>
+      <packagereq type="optional">picosat</packagereq>
+      <packagereq type="optional">picosat-devel</packagereq>
       <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">pvm</packagereq>
       <packagereq type="optional">pvs-sbcl</packagereq>
@@ -5612,6 +5627,7 @@
       <packagereq type="optional">picard</packagereq>
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">pocketsphinx</packagereq>
+      <packagereq type="optional">pocketsphinx-plugin</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
       <packagereq type="optional">pyvnc2swf</packagereq>
@@ -6650,6 +6666,7 @@
       <packagereq type="optional">icon-slicer</packagereq>
       <packagereq type="optional">libXp-devel</packagereq>
       <packagereq type="optional">mesa-libGLU-devel</packagereq>
+      <packagereq type="optional">neXtaw-devel</packagereq>
       <packagereq type="optional">xorg-x11-server-devel</packagereq>
       <packagereq type="optional">xorg-x11-xbitmaps</packagereq>
     </packagelist>
diff --git a/comps-f16.xml.in b/comps-f16.xml.in
index c79dc790..c6690400 100644
--- a/comps-f16.xml.in
+++ b/comps-f16.xml.in
@@ -1009,11 +1009,10 @@
       <packagereq type="default">rpm-devel</packagereq>
       <packagereq type="default">slang-devel</packagereq>
       <packagereq type="optional">check-devel</packagereq>
-      <packagereq type="optional">cvc3-devel</packagereq>
       <packagereq type="optional">expatmm-devel</packagereq>
       <packagereq type="optional">libdwarf-devel</packagereq>
+      <packagereq type="optional">libedit-devel</packagereq>
       <packagereq type="optional">libusb-devel</packagereq>
-      <packagereq type="optional">mona-devel</packagereq>
       <packagereq type="optional">poco-devel</packagereq>
       <packagereq type="optional">poco-doc</packagereq>
     </packagelist>
@@ -1076,6 +1075,7 @@
       <packagereq type="optional">asa</packagereq>
       <packagereq type="optional">astyle</packagereq>
       <packagereq type="optional">bigloo</packagereq>
+      <packagereq type="optional">bigloo-doc</packagereq>
       <packagereq type="optional">bugzilla</packagereq>
       <packagereq type="optional">buildbot</packagereq>
       <packagereq type="optional">bzr</packagereq>
@@ -1112,6 +1112,7 @@
       <packagereq type="optional">ecl</packagereq>
       <packagereq type="optional">ElectricFence</packagereq>
       <packagereq type="optional">elfinfo</packagereq>
+      <packagereq type="optional">emacs-bigloo</packagereq>
       <packagereq type="optional">email2trac</packagereq>
       <packagereq type="optional">epydoc</packagereq>
       <packagereq type="optional">eric</packagereq>
@@ -1186,6 +1187,7 @@
       <packagereq type="optional">plague</packagereq>
       <packagereq type="optional">plague-client</packagereq>
       <packagereq type="optional">polyml</packagereq>
+      <packagereq type="optional">polyml-doc</packagereq>
       <packagereq type="optional">pscan</packagereq>
       <packagereq type="optional">pungi</packagereq>
       <packagereq type="optional">pylint</packagereq>
@@ -1400,6 +1402,7 @@
       <packagereq type="optional">xemacs</packagereq>
       <packagereq type="optional">xemacs-ess</packagereq>
       <packagereq type="optional">xemacs-muse</packagereq>
+      <packagereq type="optional">xemacs-packages-base</packagereq>
       <packagereq type="optional">xemacs-packages-extra</packagereq>
       <packagereq type="optional">xmlcopyeditor</packagereq>
       <packagereq type="optional">zile</packagereq>
@@ -1578,7 +1581,16 @@
       <packagereq type="optional">cdo</packagereq>
       <packagereq type="optional">cernlib-utils</packagereq>
       <packagereq type="optional">chemtool</packagereq>
+      <packagereq type="optional">coq</packagereq>
+      <packagereq type="optional">coq-coqide</packagereq>
+      <packagereq type="optional">coq-doc</packagereq>
+      <packagereq type="optional">coq-emacs</packagereq>
+      <packagereq type="optional">coq-xemacs</packagereq>
+      <packagereq type="optional">csisat</packagereq>
+      <packagereq type="optional">cudd</packagereq>
+      <packagereq type="optional">cudd-devel</packagereq>
       <packagereq type="optional">cvc3</packagereq>
+      <packagereq type="optional">cvc3-devel</packagereq>
       <packagereq type="optional">cvc3-doc</packagereq>
       <packagereq type="optional">cvc3-emacs</packagereq>
       <packagereq type="optional">cvc3-xemacs</packagereq>
@@ -1623,6 +1635,7 @@
       <packagereq type="optional">maxima</packagereq>
       <packagereq type="optional">maxima-gui</packagereq>
       <packagereq type="optional">mona</packagereq>
+      <packagereq type="optional">mona-devel</packagereq>
       <packagereq type="optional">mona-emacs</packagereq>
       <packagereq type="optional">mona-examples</packagereq>
       <packagereq type="optional">mona-xemacs</packagereq>
@@ -1638,6 +1651,8 @@
       <packagereq type="optional">paraview</packagereq>
       <packagereq type="optional">paw</packagereq>
       <packagereq type="optional">perl-bioperl</packagereq>
+      <packagereq type="optional">picosat</packagereq>
+      <packagereq type="optional">picosat-devel</packagereq>
       <packagereq type="optional">plotutils</packagereq>
       <packagereq type="optional">pvm</packagereq>
       <packagereq type="optional">pvs-sbcl</packagereq>
@@ -5610,6 +5625,7 @@
       <packagereq type="optional">picard</packagereq>
       <packagereq type="optional">pitivi</packagereq>
       <packagereq type="optional">pocketsphinx</packagereq>
+      <packagereq type="optional">pocketsphinx-plugin</packagereq>
       <packagereq type="optional">pulseaudio-module-lirc</packagereq>
       <packagereq type="optional">pulseaudio-module-zeroconf</packagereq>
       <packagereq type="optional">pyvnc2swf</packagereq>
@@ -6649,6 +6665,7 @@
       <packagereq type="optional">icon-slicer</packagereq>
       <packagereq type="optional">libXp-devel</packagereq>
       <packagereq type="optional">mesa-libGLU-devel</packagereq>
+      <packagereq type="optional">neXtaw-devel</packagereq>
       <packagereq type="optional">xorg-x11-server-devel</packagereq>
       <packagereq type="optional">xorg-x11-xbitmaps</packagereq>
     </packagelist>