diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index c3a0c9c9..db7e0b81 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -2251,11 +2251,13 @@
       <packagereq type="mandatory">units</packagereq>
       <packagereq type="mandatory">wxMaxima</packagereq>
       <packagereq type="mandatory">xfig</packagereq>
+      <packagereq type="optional">4ti2</packagereq>
       <packagereq type="optional">alt-ergo</packagereq>
       <packagereq type="optional">alt-ergo-gui</packagereq>
       <packagereq type="optional">atlas</packagereq>
       <packagereq type="optional">automaton</packagereq>
       <packagereq type="optional">automaton-javadoc</packagereq>
+      <packagereq type="optional">azove</packagereq>
       <packagereq type="optional">blas</packagereq>
       <packagereq type="optional">bliss</packagereq>
       <packagereq type="optional">bowtie</packagereq>
@@ -2279,6 +2281,7 @@
       <packagereq type="optional">cvc3-doc</packagereq>
       <packagereq type="optional">cvc3-emacs</packagereq>
       <packagereq type="optional">cvc3-xemacs</packagereq>
+      <packagereq type="optional">cvc4</packagereq>
       <packagereq type="optional">dx</packagereq>
       <packagereq type="optional">dx-samples</packagereq>
       <packagereq type="optional">E</packagereq>
@@ -2287,12 +2290,17 @@
       <packagereq type="optional">fastx_toolkit</packagereq>
       <packagereq type="optional">fflas-ffpack-devel</packagereq>
       <packagereq type="optional">flint</packagereq>
+      <packagereq type="optional">flocq</packagereq>
+      <packagereq type="optional">frama-c</packagereq>
       <packagereq type="optional">freefem++</packagereq>
       <packagereq type="optional">gabedit</packagereq>
       <packagereq type="optional">galculator</packagereq>
       <packagereq type="optional">gap</packagereq>
+      <packagereq type="optional">gappa</packagereq>
+      <packagereq type="optional">gappalib-coq</packagereq>
       <packagereq type="optional">gdl</packagereq>
       <packagereq type="optional">genius</packagereq>
+      <packagereq type="optional">genus2reduction</packagereq>
       <packagereq type="optional">geomview</packagereq>
       <packagereq type="optional">gfan</packagereq>
       <packagereq type="optional">ginac</packagereq>
@@ -2313,13 +2321,16 @@
       <packagereq type="optional">hdf5</packagereq>
       <packagereq type="optional">hmmer</packagereq>
       <packagereq type="optional">jmol</packagereq>
+      <packagereq type="optional">jnormaliz</packagereq>
       <packagereq type="optional">kpolynome</packagereq>
       <packagereq type="optional">kst</packagereq>
       <packagereq type="optional">lagan</packagereq>
       <packagereq type="optional">lapack</packagereq>
+      <packagereq type="optional">latte-integrale</packagereq>
       <packagereq type="optional">libctl</packagereq>
       <packagereq type="optional">libmatheval</packagereq>
       <packagereq type="optional">libtcd</packagereq>
+      <packagereq type="optional">linbox</packagereq>
       <packagereq type="optional">ltl2ba</packagereq>
       <packagereq type="optional">Macaulay2</packagereq>
       <packagereq type="optional">malaga</packagereq>
@@ -2336,6 +2347,7 @@
       <packagereq type="optional">nco</packagereq>
       <packagereq type="optional">ncview</packagereq>
       <packagereq type="optional">netcdf</packagereq>
+      <packagereq type="optional">normaliz</packagereq>
       <packagereq type="optional">openbabel</packagereq>
       <packagereq type="optional">opencv</packagereq>
       <packagereq type="optional">paraview</packagereq>
@@ -2345,14 +2357,17 @@
       <packagereq type="optional">polybori</packagereq>
       <packagereq type="optional">polybori-gui</packagereq>
       <packagereq type="optional">polybori-ipbori</packagereq>
+      <packagereq type="optional">polymake</packagereq>
       <packagereq type="optional">pvm</packagereq>
       <packagereq type="optional">pvs-sbcl</packagereq>
       <packagereq type="optional">pypop</packagereq>
       <packagereq type="optional">python-biopython</packagereq>
       <packagereq type="optional">python-cvxopt</packagereq>
       <packagereq type="optional">python-networkx</packagereq>
+      <packagereq type="optional">python-theano</packagereq>
       <packagereq type="optional">qalculate-gtk</packagereq>
       <packagereq type="optional">qalculate-kde</packagereq>
+      <packagereq type="optional">qepcad-B</packagereq>
       <packagereq type="optional">qtoctave</packagereq>
       <packagereq type="optional">root</packagereq>
       <packagereq type="optional">routino</packagereq>
@@ -2363,15 +2378,19 @@
       <packagereq type="optional">stix-math-fonts</packagereq>
       <packagereq type="optional">stp</packagereq>
       <packagereq type="optional">symmetrica</packagereq>
+      <packagereq type="optional">sympy</packagereq>
       <packagereq type="optional">tcd-utils</packagereq>
       <packagereq type="optional">TeXmacs</packagereq>
       <packagereq type="optional">tgif</packagereq>
       <packagereq type="optional">tideEditor</packagereq>
+      <packagereq type="optional">TOPCOM</packagereq>
       <packagereq type="optional">vaspview</packagereq>
       <packagereq type="optional">veusz</packagereq>
       <packagereq type="optional">vinci</packagereq>
       <packagereq type="optional">wgrib</packagereq>
       <packagereq type="optional">wgrib2</packagereq>
+      <packagereq type="optional">why</packagereq>
+      <packagereq type="optional">why3</packagereq>
       <packagereq type="optional">wise2</packagereq>
       <packagereq type="optional">wvs-data</packagereq>
       <packagereq type="optional">xdrawchem</packagereq>