diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
index 249d4d3a..20c73c88 100644
--- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
+++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb
@@ -34,8 +34,8 @@ DEPENDS += " \
     networkmanager-qt \
     libksysguard \
     libkscreen \
-    kwayland \
     libdbusmenu-qt5 \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver libsm libxcb kwin", "", d)} \
     zlib \
 "
diff --git a/recipes-kde/plasma/untier/breeze/breeze.bb b/recipes-kde/plasma/untier/breeze/breeze.bb
index 27e90f60..b90e30f0 100644
--- a/recipes-kde/plasma/untier/breeze/breeze.bb
+++ b/recipes-kde/plasma/untier/breeze/breeze.bb
@@ -19,6 +19,7 @@ DEPENDS += " \
     kdecoration \
     frameworkintegration \
     kcmutils \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "",d)} \
 "
 
diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
index 2b344c18..f05213b0 100644
--- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
+++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb
@@ -29,7 +29,7 @@ DEPENDS += " \
 
 # REVISIT optionals
 DEPENDS += " \
-    kwayland \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver", "", d)} \
 "
 
diff --git a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
index 57005257..f6d0d84f 100644
--- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
+++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb
@@ -18,8 +18,7 @@ DEPENDS += " \
     kglobalaccel \
     libxcb \
     qtx11extras \
-    kwayland \
-    wayland \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb
index cfcb2763..1d7cd6b4 100644
--- a/recipes-kde/plasma/untier/kwin/kwin.bb
+++ b/recipes-kde/plasma/untier/kwin/kwin.bb
@@ -34,7 +34,6 @@ DEPENDS += " \
     knewstuff \
     kxmlgui \
     kdecoration \
-	kwayland \
     kscreenlocker \
 "
 
diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
index 04445b7b..de4174bf 100644
--- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
+++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb
@@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = " \
 	file://COPYING.LIB;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 "
 
-DEPENDS += "kwayland"
-
 inherit kde-plasma cmake-lib
 
 DEPENDS += " \
-	${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
+    ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/xserver qtx11extras", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"
diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb
index 28125756..a99b98c3 100644
--- a/recipes-kde/plasma/untier/oxygen/oxygen.bb
+++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb
@@ -17,6 +17,7 @@ DEPENDS += " \
     frameworkintegration \
     kwindowsystem \
     kdecoration \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
     ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras", "", d)} \
 "
 
diff --git a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
index 93d18cee..7254002b 100644
--- a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
+++ b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb
@@ -15,7 +15,7 @@ DEPENDS += " \
     kio \
     knotifications \
     kwidgetsaddons \
-    kwayland \
+    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "kwayland", "", d)} \
 "
 
 PV = "${PLASMA_VERSION}"