diff --git a/comps-f24.xml.in b/comps-f24.xml.in
index 1ced943f..31619e26 100644
--- a/comps-f24.xml.in
+++ b/comps-f24.xml.in
@@ -2544,7 +2544,6 @@
       <packagereq>at-spi2-core</packagereq>
       <packagereq>avahi</packagereq>
       <packagereq>baobab</packagereq>
-      <packagereq>bijiben</packagereq>
       <packagereq>caribou</packagereq>
       <packagereq>caribou-gtk2-module</packagereq>
       <packagereq>caribou-gtk3-module</packagereq>
@@ -2555,9 +2554,6 @@
       <packagereq>evince</packagereq>
       <packagereq>evince-djvu</packagereq>
       <packagereq>evince-nautilus</packagereq>
-      <packagereq>evolution</packagereq>
-      <packagereq>evolution-ews</packagereq>
-      <packagereq>evolution-help</packagereq>
       <packagereq>file-roller</packagereq>
       <packagereq>file-roller-nautilus</packagereq>
       <packagereq>fprintd-pam</packagereq>
@@ -2566,7 +2562,6 @@
       <packagereq>glib-networking</packagereq>
       <packagereq>gnome-backgrounds</packagereq>
       <packagereq>gnome-bluetooth</packagereq>
-      <packagereq>gnome-boxes</packagereq>
       <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-characters</packagereq>
       <packagereq>gnome-classic-session</packagereq>
@@ -2617,11 +2612,9 @@
       <packagereq>PackageKit-command-not-found</packagereq>
       <packagereq>PackageKit-gtk3-module</packagereq>
       <packagereq>polkit</packagereq>
-      <packagereq>rhythmbox</packagereq>
       <packagereq>rygel</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
       <packagereq>seahorse</packagereq>
-      <packagereq>shotwell</packagereq>
       <packagereq>sushi</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-nautilus</packagereq>
@@ -6372,6 +6365,7 @@
       <packagereq>bash-completion</packagereq>
       <packagereq>bc</packagereq>
       <packagereq>bind-utils</packagereq>
+      <packagereq>bijiben</packagereq>
       <packagereq>bridge-utils</packagereq>
       <packagereq>btrfs-progs</packagereq>
       <packagereq>bzip2</packagereq>
@@ -6388,6 +6382,9 @@
       <packagereq>dos2unix</packagereq>
       <packagereq>dosfstools</packagereq>
       <packagereq>ethtool</packagereq>
+      <packagereq>evolution</packagereq>
+      <packagereq>evolution-ews</packagereq>
+      <packagereq>evolution-help</packagereq>
       <packagereq>fedora-productimg-workstation</packagereq>
       <packagereq>fedora-release-workstation</packagereq>
       <packagereq>fedora-user-agent-chrome</packagereq>
@@ -6395,6 +6392,7 @@
       <packagereq>fpaste</packagereq>
       <packagereq>fros-gnome</packagereq>
       <packagereq>glibc-all-langpacks</packagereq>
+      <packagereq>gnome-boxes</packagereq>
       <packagereq>gnome-shell-extension-background-logo</packagereq>
       <packagereq>gnupg2</packagereq>
       <packagereq>google-android-emoji-fonts</packagereq>
@@ -6448,12 +6446,14 @@
       <packagereq>quota</packagereq>
       <packagereq>rdist</packagereq>
       <packagereq>realmd</packagereq>
+      <packagereq>rhythmbox</packagereq>
       <packagereq>rng-tools</packagereq>
       <packagereq>rp-pppoe</packagereq>
       <packagereq>rsync</packagereq>
       <packagereq>scl-utils</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>setuptool</packagereq>
+      <packagereq>shotwell</packagereq>
       <packagereq>sos</packagereq>
       <packagereq>sssd</packagereq>
       <packagereq>sudo</packagereq>
diff --git a/comps-f25.xml.in b/comps-f25.xml.in
index b06ee222..34b800a6 100644
--- a/comps-f25.xml.in
+++ b/comps-f25.xml.in
@@ -2544,7 +2544,6 @@
       <packagereq>at-spi2-core</packagereq>
       <packagereq>avahi</packagereq>
       <packagereq>baobab</packagereq>
-      <packagereq>bijiben</packagereq>
       <packagereq>caribou</packagereq>
       <packagereq>caribou-gtk2-module</packagereq>
       <packagereq>caribou-gtk3-module</packagereq>
@@ -2555,9 +2554,6 @@
       <packagereq>evince</packagereq>
       <packagereq>evince-djvu</packagereq>
       <packagereq>evince-nautilus</packagereq>
-      <packagereq>evolution</packagereq>
-      <packagereq>evolution-ews</packagereq>
-      <packagereq>evolution-help</packagereq>
       <packagereq>file-roller</packagereq>
       <packagereq>file-roller-nautilus</packagereq>
       <packagereq>fprintd-pam</packagereq>
@@ -2566,7 +2562,6 @@
       <packagereq>glib-networking</packagereq>
       <packagereq>gnome-backgrounds</packagereq>
       <packagereq>gnome-bluetooth</packagereq>
-      <packagereq>gnome-boxes</packagereq>
       <packagereq>gnome-calculator</packagereq>
       <packagereq>gnome-characters</packagereq>
       <packagereq>gnome-classic-session</packagereq>
@@ -2617,11 +2612,9 @@
       <packagereq>PackageKit-command-not-found</packagereq>
       <packagereq>PackageKit-gtk3-module</packagereq>
       <packagereq>polkit</packagereq>
-      <packagereq>rhythmbox</packagereq>
       <packagereq>rygel</packagereq>
       <packagereq>sane-backends-drivers-scanners</packagereq>
       <packagereq>seahorse</packagereq>
-      <packagereq>shotwell</packagereq>
       <packagereq>sushi</packagereq>
       <packagereq>totem</packagereq>
       <packagereq>totem-nautilus</packagereq>
@@ -6365,6 +6358,7 @@
       <packagereq>bash-completion</packagereq>
       <packagereq>bc</packagereq>
       <packagereq>bind-utils</packagereq>
+      <packagereq>bijiben</packagereq>
       <packagereq>bridge-utils</packagereq>
       <packagereq>btrfs-progs</packagereq>
       <packagereq>bzip2</packagereq>
@@ -6381,6 +6375,9 @@
       <packagereq>dos2unix</packagereq>
       <packagereq>dosfstools</packagereq>
       <packagereq>ethtool</packagereq>
+      <packagereq>evolution</packagereq>
+      <packagereq>evolution-ews</packagereq>
+      <packagereq>evolution-help</packagereq>
       <packagereq>fedora-productimg-workstation</packagereq>
       <packagereq>fedora-release-workstation</packagereq>
       <packagereq>fedora-user-agent-chrome</packagereq>
@@ -6388,6 +6385,7 @@
       <packagereq>fpaste</packagereq>
       <packagereq>fros-gnome</packagereq>
       <packagereq>glibc-all-langpacks</packagereq>
+      <packagereq>gnome-boxes</packagereq>
       <packagereq>gnome-shell-extension-background-logo</packagereq>
       <packagereq>gnupg2</packagereq>
       <packagereq>google-android-emoji-fonts</packagereq>
@@ -6441,12 +6439,14 @@
       <packagereq>quota</packagereq>
       <packagereq>rdist</packagereq>
       <packagereq>realmd</packagereq>
+      <packagereq>rhythmbox</packagereq>
       <packagereq>rng-tools</packagereq>
       <packagereq>rp-pppoe</packagereq>
       <packagereq>rsync</packagereq>
       <packagereq>scl-utils</packagereq>
       <packagereq>setroubleshoot</packagereq>
       <packagereq>setuptool</packagereq>
+      <packagereq>shotwell</packagereq>
       <packagereq>sos</packagereq>
       <packagereq>sssd</packagereq>
       <packagereq>sudo</packagereq>