diff --git a/gui-wm/sway/sway-1.8.ebuild b/gui-wm/sway/sway-1.8-r1.ebuild
similarity index 98%
rename from gui-wm/sway/sway-1.8.ebuild
rename to gui-wm/sway/sway-1.8-r1.ebuild
index 8468aba7acc3d..b689ca496c426 100644
--- a/gui-wm/sway/sway-1.8.ebuild
+++ b/gui-wm/sway/sway-1.8-r1.ebuild
@@ -32,7 +32,6 @@ DEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	x11-libs/xcb-util-wm
 	media-libs/mesa[gles2,libglvnd(+)]
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	tray? ( || (
@@ -41,7 +40,10 @@ DEPEND="
 		sys-libs/basu
 	) )
 	wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
-	X? ( x11-libs/libxcb:0= )
+	X? (
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-wm
+	)
 "
 # x11-libs/xcb-util-wm needed for xcb-iccm
 if [[ ${PV} == 9999 ]]; then
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 8468aba7acc3d..b689ca496c426 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -32,7 +32,6 @@ DEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
-	x11-libs/xcb-util-wm
 	media-libs/mesa[gles2,libglvnd(+)]
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	tray? ( || (
@@ -41,7 +40,10 @@ DEPEND="
 		sys-libs/basu
 	) )
 	wallpapers? ( gui-apps/swaybg[gdk-pixbuf(+)] )
-	X? ( x11-libs/libxcb:0= )
+	X? (
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-wm
+	)
 "
 # x11-libs/xcb-util-wm needed for xcb-iccm
 if [[ ${PV} == 9999 ]]; then