diff --git a/comps-f21.xml.in b/comps-f21.xml.in
index 65ecef8d..92fefa63 100644
--- a/comps-f21.xml.in
+++ b/comps-f21.xml.in
@@ -4346,14 +4346,13 @@
       <packagereq>mate-applets</packagereq>
       <packagereq>mate-applet-softupd</packagereq>
       <packagereq>mate-backgrounds</packagereq>
-      <packagereq>mate-bluetooth</packagereq>
       <packagereq>mate-calc</packagereq>
       <packagereq>mate-control-center</packagereq>
       <packagereq>mate-character-map</packagereq>
       <packagereq>mate-desktop</packagereq>
       <packagereq>mate-dialogs</packagereq>
-      <packagereq>mate-document-viewer</packagereq>
-      <packagereq>mate-document-viewer-caja</packagereq>
+      <packagereq>atril</packagereq>
+      <packagereq>atril-caja</packagereq>
       <packagereq>mate-file-archiver</packagereq>
       <packagereq>caja</packagereq>
       <packagereq>mate-file-manager-image-converter</packagereq>
@@ -4361,8 +4360,6 @@
       <packagereq>mate-file-manager-open-terminal</packagereq>
       <packagereq>mate-icon-theme</packagereq>
       <packagereq>mate-image-viewer</packagereq>
-      <packagereq>mate-keyring</packagereq>
-      <packagereq>mate-keyring-pam</packagereq>
       <packagereq>mate-media</packagereq>
       <packagereq>mate-menus</packagereq>
       <packagereq>mate-menu-editor</packagereq>
@@ -4413,7 +4410,6 @@
       <packagereq>filezilla</packagereq>
       <packagereq>mate-applet-lockkeys</packagereq>
       <packagereq>mate-applet-softupd</packagereq>
-      <packagereq>mate-bluetooth</packagereq>
       <packagereq>mate-dictionary</packagereq>
       <packagereq>mate-disk-usage-analyzer</packagereq>
       <packagereq>mate-file-manager-share</packagereq>