diff --git a/dev-libs/wlc/metadata.xml b/dev-libs/wlc/metadata.xml
index bd85b2b7a6ab4..3319b29914b01 100644
--- a/dev-libs/wlc/metadata.xml
+++ b/dev-libs/wlc/metadata.xml
@@ -12,5 +12,6 @@
 	<use>
 		<flag name="systemd">Enable support for systemd-logind.</flag>
 		<flag name="X">Enable X11 backend and XWayland support.</flag>
+		<flag name="xwayland">Enable XWayland support.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/wlc/wlc-9999.ebuild b/dev-libs/wlc/wlc-9999.ebuild
index 5a3e040fbf84a..e44e750107d2e 100644
--- a/dev-libs/wlc/wlc-9999.ebuild
+++ b/dev-libs/wlc/wlc-9999.ebuild
@@ -14,7 +14,7 @@ EGIT_REPO_URI="https://github.com/Cloudef/wlc.git"
 LICENSE="MIT ZLIB"
 SLOT="0"
 KEYWORDS=""
-IUSE="X static-libs systemd"
+IUSE="X static-libs systemd xwayland"
 
 RDEPEND="virtual/opengl
 		media-libs/mesa[wayland,gbm,gles2,egl]
@@ -29,6 +29,7 @@ RDEPEND="virtual/opengl
 			 x11-libs/xcb-util-image
 			 x11-libs/xcb-util-wm
 			 x11-libs/libXfixes )
+		xwayland? ( x11-base/xorg-server[wayland] )
 		systemd? ( sys-apps/systemd sys-apps/dbus )"
 
 DEPEND="${RDEPEND}
@@ -52,9 +53,8 @@ src_configure() {
 }
 
 pkg_postinst() {
-	if use X && !has_version 'x11-base/xorg-server[wayland]'
+	if use X && !use xwayland
 	then
-		elog "You have enabled wlc's X11 support. To use Xwayland, you must emerge"
-		elog "'x11-base/xorg-server[wayland]'."
+		elog "xwayland use flag is required for X11 applications support"
 	fi
 }