diff --git a/recipes-kde/apps/khelpcenter/khelpcenter.bb b/recipes-kde/apps/khelpcenter/khelpcenter.bb
index 75fec85c..47224d58 100644
--- a/recipes-kde/apps/khelpcenter/khelpcenter.bb
+++ b/recipes-kde/apps/khelpcenter/khelpcenter.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
     kwindowsystem \
     sonnet-native \
     \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${KDE_APP_VERSION}"
diff --git a/recipes-kde/apps/konsole/konsole.bb b/recipes-kde/apps/konsole/konsole.bb
index ceebd820..1c29de6e 100644
--- a/recipes-kde/apps/konsole/konsole.bb
+++ b/recipes-kde/apps/konsole/konsole.bb
@@ -35,7 +35,7 @@ DEPENDS += " \
     kwindowsystem \
     kxmlgui \
     sonnet-native \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
 "
 
 
diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
index ea97b432..cfd95fb6 100644
--- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb
@@ -33,7 +33,7 @@ DEPENDS += " \
     kded \
     kauth-native \
     sonnet-native \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 # uncomment for broken gelib getaddr / AI_PASSIVE
diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
index 62569a0d..3e6d53db 100644
--- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
+++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb
@@ -33,7 +33,7 @@ DEPENDS += " \
     giflib \
     libpng \
     \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${KF5_VERSION}"
diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
index 65760de0..b8111303 100644
--- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
+++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \
 
 inherit kde-kf5 cmake_auto_align_paths cmake_lib
 
-DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras libxrender", "", d)}"
+DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxrender", "", d)}"
 
 PV = "${KF5_VERSION}"
 SRC_URI[md5sum] = "ca000f985de0be2bb3c602697d1bb923"
diff --git a/recipes-kde/kf5/tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb
index fad19797..df610dc6 100644
--- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb
+++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb
@@ -12,7 +12,7 @@ DEPENDS += " \
     kcoreaddons-native \
     kservice \
     kpty \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
 "
 
 PV = "${KF5_VERSION}"
diff --git a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
index 1e579678..4bd991a2 100644
--- a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
+++ b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb
@@ -12,7 +12,7 @@ DEPENDS += " \
     kcrash \
     kdbusaddons \
     kservice \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${KF5_VERSION}"
diff --git a/recipes-kde/kf5/tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb
index 7543308f..c6cc3d2e 100644
--- a/recipes-kde/kf5/tier3/kinit/kinit.bb
+++ b/recipes-kde/kf5/tier3/kinit/kinit.bb
@@ -19,7 +19,7 @@ DEPENDS += " \
     kauth-native \
     kdoctools \
     kdoctools-native \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
 "
 
 PV = "${KF5_VERSION}"
diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb
index bf588032..1b5601e4 100644
--- a/recipes-kde/kf5/tier3/kio/kio.bb
+++ b/recipes-kde/kf5/tier3/kio/kio.bb
@@ -22,7 +22,7 @@ DEPENDS += " \
     kwallet \
     kauth-native \
     sonnet-native \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
 "
 
 PV = "${KF5_VERSION}"
diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
index a9d10f98..1074266a 100644
--- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
+++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb
@@ -35,7 +35,7 @@ DEPENDS += " \
     kpackage-native \
     kwayland \
     kauth-native \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${KF5_VERSION}"
diff --git a/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb b/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb
index fe031eba..70f61b09 100644
--- a/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb
+++ b/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb
@@ -14,7 +14,7 @@ DEPENDS += " \
     kirigami2 \
     kiconthemes \
     kconfigwidgets \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${KF5_VERSION}"
diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index de28a82c..acfe0292 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -43,7 +43,7 @@ DEPENDS += " \
     sonnet-native \
     kdesignerplugin-native \
     kdelibs4support-native \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 libsm libxcb", "", d)} \
     zlib \
 "
 
diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
index 9ce2f16d..8b176c84 100644
--- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
+++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb
@@ -32,7 +32,7 @@ DEPENDS += " \
     sonnet-native \
     plasma-workspace \
     \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
index aa0875c3..949d4d65 100644
--- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
+++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb
@@ -27,7 +27,7 @@ DEPENDS += "\
     plasma-framework \
     plasma-workspace \
     \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
index 672f7f2a..d1fb898e 100644
--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -35,7 +35,7 @@ DEPENDS += " \
 
 # REVISIT optionals
 DEPENDS += " \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index b603216d..ef9ce314 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -45,7 +45,7 @@ DEPENDS += " \
 
 # this condition matches always currently - it is kept in this way as a marker
 DEPENDS += " \
-	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras libepoxy xcb-util-cursor", "",d)} \
+	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libepoxy xcb-util-cursor", "",d)} \
 "
 
 # REVISIT: PACKAGECONFIG for optionals
diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index 81ac5305..604e5903 100644
--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \
 inherit kde-plasma
 
 DEPENDS += " \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
index a127fa50..16dc8942 100644
--- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
+++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb
@@ -24,7 +24,7 @@ DEPENDS += " \
     kservice \
     plasma-framework \
     kpackage-native \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras libxres", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxres", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
index 64b836c0..53c2f3ee 100644
--- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
+++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb
@@ -39,7 +39,7 @@ DEPENDS += " \
     kdesignerplugin-native \
     sonnet-native \
     \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libxcb qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 libxcb libxkbfile qtx11extras", "", d)} \
 "
 
 # REVISIT optionals: find_package(PackageKitQt5 0.9)
diff --git a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
index a806f6a2..9d632596 100644
--- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
+++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb
@@ -19,7 +19,7 @@ DEPENDS += " \
     kconfigwidgets \
     kio \
     knewstuff \
-    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcursor libxcb virtual/xserver", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcursor libxcb virtual/libx11", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"