diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index e9039c7..fdae309 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -12,6 +12,7 @@ exclude_list_groups:
   - libreoffice
   - gnome-desktop
   - container-management
+  - base-x
 
 # PackageKit is spread across various groups
 # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264
@@ -99,6 +100,8 @@ exclude_list:
     - gnome-shell-extension-background-logo
     - pinentry-gnome3
     - qgnomeplatform-qt5
+    # X11 specific
+    - xorg-x11-drv-libinput
   networkmanager-submodules:
     # Let's use the builtin one by default
     - dhcp-client
diff --git a/comps-sync.py b/comps-sync.py
index b12573a..9310959 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -163,15 +163,15 @@ if (n_manifest_new > 0 or n_comps_new > 0) and args.save:
 
 # List of comps groups used for each desktop
 desktops_comps_groups = {
-    "gnome": ["gnome-desktop"],
-    "kde": ["kde-desktop"],
-    "xfce": ["xfce-desktop"],
-    "lxqt": ["lxqt-desktop"],
-    "deepin": ["deepin-desktop"],
-    "mate": ["mate-desktop"],
+    "gnome": ["gnome-desktop", "base-x"],
+    "kde": ["kde-desktop", "base-x"],
+    "xfce": ["xfce-desktop", "base-x"],
+    "lxqt": ["lxqt-desktop", "base-x"],
+    "deepin": ["deepin-desktop", "base-x"],
+    "mate": ["mate-desktop", "base-x"],
     "sway": ["swaywm", "swaywm-extended"],
-    "cinnamon": ["cinnamon-desktop"],
-    "budgie": ["budgie-desktop", "budgie-desktop-apps"]
+    "cinnamon": ["cinnamon-desktop", "base-x"],
+    "budgie": ["budgie-desktop", "budgie-desktop-apps", "base-x"]
 }
 
 # Generate treefiles for all desktops