diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 9b067e95..40969e3d 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -6341,6 +6341,228 @@
false
fedora-release-workstation
+ abrt-cli
+ abrt-desktop
+ abrt-java-connector
+ acl
+ aisleriot
+ at
+ at-spi2-atk
+ at-spi2-core
+ attr
+ avahi
+ baobab
+ bash-completion
+ bc
+ bijiben
+ bind-utils
+ brasero-nautilus
+ brasero
+ bridge-utils
+ btrfs-progs
+ bzip2
+ caribou-gtk2-module
+ caribou-gtk3-module
+ caribou
+ cheese
+ chrony
+ cifs-utils
+ control-center
+ coolkey
+ cpio
+ crontabs
+ cryptsetup
+ cyrus-sasl-plain
+ dbus
+ dconf
+ deja-dup
+ deltarpm
+ desktop-backgrounds-basic
+ dos2unix
+ dosfstools
+ dump
+ ed
+ empathy
+ eog
+ ethtool
+ evince-nautilus
+ evince
+ evolution-ews
+ evolution-help
+ evolution
+ fedora-release-notes
+ file
+ file-roller-nautilus
+ file-roller
+ finger
+ firefox
+ firewall-config
+ fpaste
+ fprintd-pam
+ ftp
+ gdm
+ gedit
+ glib-networking
+ gnome-backgrounds
+ gnome-bluetooth
+ gnome-boxes
+ gnome-calculator
+ gnome-classic-session
+ gnome-clocks
+ gnome-color-manager
+ gnome-contacts
+ gnome-dictionary
+ gnome-disk-utility
+ gnome-documents
+ gnome-font-viewer
+ gnome-getting-started-docs
+ gnome-initial-setup
+ gnome-logs
+ gnome-maps
+ gnome-packagekit
+ gnome-screenshot
+ gnome-session-xsession
+ gnome-settings-daemon
+ gnome-shell
+ gnome-software
+ gnome-sound-recorder
+ gnome-system-monitor
+ gnome-terminal
+ gnome-themes-standard
+ gnome-user-docs
+ gnome-user-share
+ gnome-weather
+ gnupg2
+ gtk2-immodule-xim
+ gtk3-immodule-xim
+ gucharmap
+ gvfs-afc
+ gvfs-afp
+ gvfs-archive
+ gvfs-fuse
+ gvfs-goa
+ gvfs-gphoto2
+ gvfs-mtp
+ gvfs-smb
+ hunspell
+ ibus-chewing
+ ibus-gtk2
+ ibus-gtk3
+ ibus-hangul
+ ibus-kkc
+ ibus-libpinyin
+ ibus-m17n
+ ibus-rawcode
+ ibus-typing-booster
+ icedtea-web
+ im-chooser
+ imsettings-gsettings
+ imsettings
+ iptstate
+ irda-utils
+ irqbalance
+ isdn4k-utils
+ jwhois
+ lftp
+ libcanberra-gtk2
+ libcanberra-gtk3
+ libproxy-mozjs
+ librsvg2
+ libsane-hpaio
+ linux-atm
+ logrotate
+ lrzsz
+ lsof
+ mailcap
+ man-pages
+ mcelog
+ mdadm
+ microcode_ctl
+ minicom
+ mlocate
+ ModemManager
+ mousetweaks
+ mtr
+ nano
+ nautilus
+ nautilus-sendto
+ net-tools
+ NetworkManager-adsl
+ NetworkManager-l2tp
+ NetworkManager-openconnect
+ NetworkManager-openvpn-gnome
+ NetworkManager-pptp-gnome
+ NetworkManager-vpnc-gnome
+ nfs-utils
+ nmap-ncat
+ nm-connection-editor
+ ntfs-3g
+ ntfsprogs
+ ntsysv
+ numactl
+ orca
+ PackageKit-command-not-found
+ PackageKit-gtk3-module
+ PackageKit-yum-plugin
+ pam_krb5
+ pam_pkcs11
+ passwdqc
+ pciutils
+ pcmciautils
+ pinfo
+ plymouth
+ pm-utils
+ polkit-js-engine
+ ppp
+ psacct
+ quota
+ rdist
+ realmd
+ rhythmbox
+ rng-tools
+ rp-pppoe
+ rsh
+ rsync
+ rsyslog
+ rygel
+ sane-backends-drivers-scanners
+ seahorse
+ setroubleshoot
+ setuptool
+ shotwell
+ simple-scan
+ smartmontools
+ sos
+ sssd
+ stunnel
+ sudo
+ sushi
+ symlinks
+ talk
+ tar
+ tcpdump
+ tcp_wrappers
+ telnet
+ time
+ totem-nautilus
+ totem
+ traceroute
+ transmission-gtk
+ tree
+ unzip
+ usbutils
+ vconfig
+ vinagre
+ wget
+ which
+ wireless-tools
+ words
+ wvdial
+ xdg-user-dirs-gtk
+ yelp
+ yum-langpacks
+ yum-utils
+ zip
@@ -6811,18 +7033,13 @@
workstation-product
base-x
- standard
core
- dial-up
fonts
- input-methods
multimedia
networkmanager-submodules
hardware-support
printing
- firefox
guest-desktop-agents
- gnome-desktop
libreoffice
diff --git a/comps-f22.xml.in b/comps-f22.xml.in
index 2b06de56..f5abad77 100644
--- a/comps-f22.xml.in
+++ b/comps-f22.xml.in
@@ -6327,6 +6327,228 @@
false
fedora-release-workstation
+ abrt-cli
+ abrt-desktop
+ abrt-java-connector
+ acl
+ aisleriot
+ at
+ at-spi2-atk
+ at-spi2-core
+ attr
+ avahi
+ baobab
+ bash-completion
+ bc
+ bijiben
+ bind-utils
+ brasero-nautilus
+ brasero
+ bridge-utils
+ btrfs-progs
+ bzip2
+ caribou-gtk2-module
+ caribou-gtk3-module
+ caribou
+ cheese
+ chrony
+ cifs-utils
+ control-center
+ coolkey
+ cpio
+ crontabs
+ cryptsetup
+ cyrus-sasl-plain
+ dbus
+ dconf
+ deja-dup
+ deltarpm
+ desktop-backgrounds-basic
+ dos2unix
+ dosfstools
+ dump
+ ed
+ empathy
+ eog
+ ethtool
+ evince-nautilus
+ evince
+ evolution-ews
+ evolution-help
+ evolution
+ fedora-release-notes
+ file
+ file-roller-nautilus
+ file-roller
+ finger
+ firefox
+ firewall-config
+ fpaste
+ fprintd-pam
+ ftp
+ gdm
+ gedit
+ glib-networking
+ gnome-backgrounds
+ gnome-bluetooth
+ gnome-boxes
+ gnome-calculator
+ gnome-classic-session
+ gnome-clocks
+ gnome-color-manager
+ gnome-contacts
+ gnome-dictionary
+ gnome-disk-utility
+ gnome-documents
+ gnome-font-viewer
+ gnome-getting-started-docs
+ gnome-initial-setup
+ gnome-logs
+ gnome-maps
+ gnome-packagekit
+ gnome-screenshot
+ gnome-session-xsession
+ gnome-settings-daemon
+ gnome-shell
+ gnome-software
+ gnome-sound-recorder
+ gnome-system-monitor
+ gnome-terminal
+ gnome-themes-standard
+ gnome-user-docs
+ gnome-user-share
+ gnome-weather
+ gnupg2
+ gtk2-immodule-xim
+ gtk3-immodule-xim
+ gucharmap
+ gvfs-afc
+ gvfs-afp
+ gvfs-archive
+ gvfs-fuse
+ gvfs-goa
+ gvfs-gphoto2
+ gvfs-mtp
+ gvfs-smb
+ hunspell
+ ibus-chewing
+ ibus-gtk2
+ ibus-gtk3
+ ibus-hangul
+ ibus-kkc
+ ibus-libpinyin
+ ibus-m17n
+ ibus-rawcode
+ ibus-typing-booster
+ icedtea-web
+ im-chooser
+ imsettings-gsettings
+ imsettings
+ iptstate
+ irda-utils
+ irqbalance
+ isdn4k-utils
+ jwhois
+ lftp
+ libcanberra-gtk2
+ libcanberra-gtk3
+ libproxy-mozjs
+ librsvg2
+ libsane-hpaio
+ linux-atm
+ logrotate
+ lrzsz
+ lsof
+ mailcap
+ man-pages
+ mcelog
+ mdadm
+ microcode_ctl
+ minicom
+ mlocate
+ ModemManager
+ mousetweaks
+ mtr
+ nano
+ nautilus
+ nautilus-sendto
+ net-tools
+ NetworkManager-adsl
+ NetworkManager-l2tp
+ NetworkManager-openconnect
+ NetworkManager-openvpn-gnome
+ NetworkManager-pptp-gnome
+ NetworkManager-vpnc-gnome
+ nfs-utils
+ nmap-ncat
+ nm-connection-editor
+ ntfs-3g
+ ntfsprogs
+ ntsysv
+ numactl
+ orca
+ PackageKit-command-not-found
+ PackageKit-gtk3-module
+ PackageKit-yum-plugin
+ pam_krb5
+ pam_pkcs11
+ passwdqc
+ pciutils
+ pcmciautils
+ pinfo
+ plymouth
+ pm-utils
+ polkit-js-engine
+ ppp
+ psacct
+ quota
+ rdist
+ realmd
+ rhythmbox
+ rng-tools
+ rp-pppoe
+ rsh
+ rsync
+ rsyslog
+ rygel
+ sane-backends-drivers-scanners
+ seahorse
+ setroubleshoot
+ setuptool
+ shotwell
+ simple-scan
+ smartmontools
+ sos
+ sssd
+ stunnel
+ sudo
+ sushi
+ symlinks
+ talk
+ tar
+ tcpdump
+ tcp_wrappers
+ telnet
+ time
+ totem-nautilus
+ totem
+ traceroute
+ transmission-gtk
+ tree
+ unzip
+ usbutils
+ vconfig
+ vinagre
+ wget
+ which
+ wireless-tools
+ words
+ wvdial
+ xdg-user-dirs-gtk
+ yelp
+ yum-langpacks
+ yum-utils
+ zip
@@ -6796,18 +7018,13 @@
workstation-product
base-x
- standard
core
- dial-up
fonts
- input-methods
multimedia
networkmanager-submodules
hardware-support
printing
- firefox
guest-desktop-agents
- gnome-desktop
libreoffice