diff --git a/comps-f18.xml.in b/comps-f18.xml.in
index 21e67f73..c7fc287e 100644
--- a/comps-f18.xml.in
+++ b/comps-f18.xml.in
@@ -2914,9 +2914,11 @@
ballbuster
ballz
barrage
+ bastet
beneath-a-steel-sky
beneath-a-steel-sky-cd
berusky
+ berusky2
biloba
biniax
blobby
@@ -2932,9 +2934,13 @@
bygfoot
bzflag
ca-installer
+ CardManager
cave9
+ ccgo
cdogs-sdl
celestia
+ chocolate-doom
+ chromium-bsu
clanbomber
clonekeen
coco-coq
@@ -2949,10 +2955,13 @@
curblaster
cylindrix
cyphesis
+ darkplaces-quake
dd2
dgae
dopewars
drascula
+ drascula-music
+ dsi
duel3
ember
enigma
@@ -2960,6 +2969,7 @@
extremetuxracer
fbg
fbg2
+ fgrun
fillets-ng
findthatword
flight-of-the-amazon-queen
@@ -2977,6 +2987,7 @@
freedroidrpg
freetennis
frozen-bubble
+ funguloids
gamazons
games-menus
gbrainy
@@ -3001,14 +3012,19 @@
gnome-games-sudoku
gnome-games-swell-foop
gnome-hearts
+ gnome-mud
gnubg
gnubik
gnuchess
gnugo
+ gnujump
greyhounds
grhino
gweled
haxima
+ hexglass
+ hitori
+ iapetal
joystick
hedgewars
kbilliards
@@ -3041,6 +3057,7 @@
methane
mindless
mine_detector
+ minetest
mirrormagic
mj
monsterz
@@ -3070,9 +3087,12 @@
pipenightdreams
pipepanic
planets
+ plee-the-bear
+ pokerth
powermanga
prboom
professor-is-missing
+ puzzle-master
puzzles
pychess
PySolFC
@@ -3093,6 +3113,7 @@
rocksndiamonds
rogue
rott-shareware
+ sar2
scorched3d
scorchwentbonkers
scummvm
@@ -3108,13 +3129,16 @@
sopwith
spring
stormbaancoureur
+ sudoku-savant
supertux
supertuxkart
+ taggle
taxipilot
tecnoballz
teeworlds
tennix
tong
+ toppler
torcs
torcs-data-cars-extra
torcs-data-tracks-dirt
@@ -3124,6 +3148,7 @@
tremulous
trophy
tunneler
+ tuxmath
tuxpuck
typespeed
ularn
@@ -3140,6 +3165,7 @@
vodovod
warmux
warzone2100
+ warzone2100-sequences
wastesedge
wesnoth
widelands
@@ -3158,10 +3184,13 @@
xpilot-ng-server
xplanet
xscorch
+ xskat
xstar
xteddy
xu4
+ xword
zasx
+ zaz
diff --git a/comps-f19.xml.in b/comps-f19.xml.in
index a70441c6..9e30f4e9 100644
--- a/comps-f19.xml.in
+++ b/comps-f19.xml.in
@@ -2876,9 +2876,11 @@
ballbuster
ballz
barrage
+ bastet
beneath-a-steel-sky
beneath-a-steel-sky-cd
berusky
+ berusky2
billiards
biloba
biniax
@@ -2895,9 +2897,13 @@
bygfoot
bzflag
ca-installer
+ CardManager
cave9
+ ccgo
cdogs-sdl
celestia
+ chocolate-doom
+ chromium-bsu
clanbomber
clonekeen
coco-coq
@@ -2912,16 +2918,20 @@
curblaster
cylindrix
cyphesis
+ darkplaces-quake
dd2
dgae
dopewars
drascula
+ drascula-music
+ dsi
duel3
ember
enigma
escape
extremetuxracer
fbg2
+ fgrun
fillets-ng
findthatword
five-or-more
@@ -2942,6 +2952,7 @@
freedroidrpg
freetennis
frozen-bubble
+ funguloids
gamazons
games-menus
gbrainy
@@ -2954,6 +2965,7 @@
gnome-klotski
gnome-mahjongg
gnome-mines
+ gnome-mud
gnome-nibbles
gnome-robots
gnome-sudoku
@@ -2962,10 +2974,14 @@
gnubik
gnuchess
gnugo
+ gnujump
greyhounds
grhino
gweled
haxima
+ hexglass
+ hitori
+ iapetal
iagno
joystick
hedgewars
@@ -3000,6 +3016,7 @@
methane
mindless
mine_detector
+ minetest
mirrormagic
mj
monsterz
@@ -3028,9 +3045,12 @@
pipenightdreams
pipepanic
planets
+ plee-the-bear
+ pokerth
powermanga
prboom
professor-is-missing
+ puzzle-master
puzzles
pychess
PySolFC
@@ -3052,6 +3072,7 @@
rocksndiamonds
rogue
rott-shareware
+ sar2
scorched3d
scorchwentbonkers
scummvm
@@ -3066,9 +3087,11 @@
sopwith
spring
stormbaancoureur
+ sudoku-savant
sumwars
supertux
supertuxkart
+ taggle
swell-foop
tali
taxipilot
@@ -3076,6 +3099,7 @@
teeworlds
tennix
tong
+ toppler
torcs
torcs-data-cars-extra
torcs-data-tracks-dirt
@@ -3085,6 +3109,7 @@
tremulous
trophy
tunneler
+ tuxmath
tuxpuck
typespeed
ularn
@@ -3101,6 +3126,7 @@
vodovod
warmux
warzone2100
+ warzone2100-sequences
wastesedge
wesnoth
widelands
@@ -3120,10 +3146,13 @@
xpilot-ng-server
xplanet
xscorch
+ xskat
xstar
xteddy
xu4
+ xword
zasx
+ zaz
diff --git a/comps-f20.xml.in b/comps-f20.xml.in
index 05a615f2..fa45a994 100644
--- a/comps-f20.xml.in
+++ b/comps-f20.xml.in
@@ -2851,9 +2851,11 @@
ballbuster
ballz
barrage
+ bastet
beneath-a-steel-sky
beneath-a-steel-sky-cd
berusky
+ berusky2
billiards
biloba
biniax
@@ -2870,9 +2872,13 @@
bygfoot
bzflag
ca-installer
+ CardManager
cave9
+ ccgo
cdogs-sdl
celestia
+ chocolate-doom
+ chromium-bsu
clanbomber
clonekeen
coco-coq
@@ -2887,16 +2893,20 @@
curblaster
cylindrix
cyphesis
+ darkplaces-quake
dd2
dgae
dopewars
drascula
+ drascula-music
+ dsi
duel3
ember
enigma
escape
extremetuxracer
fbg2
+ fgrun
fillets-ng
findthatword
five-or-more
@@ -2917,6 +2927,7 @@
freedroidrpg
freetennis
frozen-bubble
+ funguloids
gamazons
games-menus
gbrainy
@@ -2929,6 +2940,7 @@
gnome-klotski
gnome-mahjongg
gnome-mines
+ gnome-mud
gnome-nibbles
gnome-robots
gnome-sudoku
@@ -2937,10 +2949,14 @@
gnubik
gnuchess
gnugo
+ gnujump
greyhounds
grhino
gweled
haxima
+ hexglass
+ hitori
+ iapetal
iagno
joystick
hedgewars
@@ -2975,6 +2991,7 @@
methane
mindless
mine_detector
+ minetest
mirrormagic
mj
monsterz
@@ -3003,9 +3020,12 @@
pipenightdreams
pipepanic
planets
+ plee-the-bear
+ pokerth
powermanga
prboom
professor-is-missing
+ puzzle-master
puzzles
pychess
PySolFC
@@ -3027,6 +3047,7 @@
rocksndiamonds
rogue
rott-shareware
+ sar2
scorched3d
scorchwentbonkers
scummvm
@@ -3041,9 +3062,11 @@
sopwith
spring
stormbaancoureur
+ sudoku-savant
sumwars
supertux
supertuxkart
+ taggle
swell-foop
tali
taxipilot
@@ -3051,6 +3074,7 @@
teeworlds
tennix
tong
+ toppler
torcs
torcs-data-cars-extra
torcs-data-tracks-dirt
@@ -3060,6 +3084,7 @@
tremulous
trophy
tunneler
+ tuxmath
tuxpuck
typespeed
ularn
@@ -3076,6 +3101,7 @@
vodovod
warmux
warzone2100
+ warzone2100-sequences
wastesedge
wesnoth
widelands
@@ -3095,10 +3121,13 @@
xpilot-ng-server
xplanet
xscorch
+ xskat
xstar
xteddy
xu4
+ xword
zasx
+ zaz