diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
index a97e274c8778..7e8552a6ea0c 100644
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -29,14 +29,14 @@ RUN_DEPENDS=	xkbcomp:x11/xkbcomp \
 CONFLICTS_INSTALL=	${PORTNAME}-devel
 
 USES=		compiler:c11 gl meson pkgconfig xorg tar:xz
-USE_GL=		egl gbm gl
-USE_XORG=	pixman xau xfont2 xkbfile xshmfence xtrans
+USE_GL=		gbm gl
+USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
 
 MESON_ARGS=	-Dxvfb=false \
-		-Dxdmcp=false \
-		-Dxcsecurity=false \
+		-Dxdmcp=true \
 		-Ddri3=true \
 		-Dglamor=true \
+		-Dxcsecurity=true \
 		-Dsha1=libmd \
 		-Dipv6=true \
 		-Dxkb_dir=${LOCALBASE}/share/X11/xkb \
@@ -55,7 +55,16 @@ DEFAULT_FONTPATH_LIST= \
 	${FONTPATH_ROOT}/75dpi/ \
 	catalogue:${FONTPATHD}
 
-OPTIONS_DEFINE=	NVIDIA
+OPTIONS_DEFINE=	CSD EI NVIDIA
+OPTIONS_DEFAULT=CSD EI
+
+CSD_DESC=		Client-side decorations via libdecor
+CSD_LIB_DEPENDS=	libdecor-0.so:x11-toolkits/libdecor
+CSD_MESON_TRUE=		libdecor
+
+EI_DESC=		Emulated input via libei
+EI_LIB_DEPENDS=		libei.so:x11/libei
+EI_MESON_OFF=		-Dxwayland_ei=false
 
 NVIDIA_DESC=		EGLStream support for glamor on Xwayland
 NVIDIA_BUILD_DEPENDS=	egl-wayland>0:graphics/egl-wayland