No problem tracking the work here! Just to be precise, this package is intended to only ever provide Xwayland, no other X server (Xserver, Xdmx, Xnest, ...), the xorg-x11-server repo/package will remain the source for those servers, as the xwayland branch is cleaned up to only consist of the necessary code for Xwayland. With this in mind i propose a multi-step approach: 1. Include xwayland in X11:XOrg and later Factory/Tumbleweed (when its ready) 2. Roll out at least one snapshot with xwayland included. This will allow the switch xorg-x11-server-wayland -> xwayland 3. Remove the xorg-x11-wayland package from the xorg-x11-server build (and save a few build cycles in a hot buildpath) and include the package in Factory/Tumbleweeed