diff --git a/x11-servers/Makefile b/x11-servers/Makefile
index a25298fb63b2..1c257544d379 100644
--- a/x11-servers/Makefile
+++ b/x11-servers/Makefile
@@ -1,16 +1,17 @@
 # $FreeBSD$
 #
 
     COMMENT = X11 servers
 
     SUBDIR += Xfstt
     SUBDIR += x2vnc
     SUBDIR += x2x
     SUBDIR += xephyr
     SUBDIR += xorg-dmx
     SUBDIR += xorg-nestserver
     SUBDIR += xorg-server
     SUBDIR += xorg-vfbserver
     SUBDIR += xwayland
+    SUBDIR += xwayland-devel
 
 .include <bsd.port.subdir.mk>
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile
new file mode 100644
index 000000000000..b11c83ad52f4
--- /dev/null
+++ b/x11-servers/xwayland-devel/Makefile
@@ -0,0 +1,52 @@
+# $FreeBSD$
+
+PORTNAME=	xwayland
+DISTVERSIONPREFIX=	xorg-server-
+DISTVERSION=	1.20.0-592
+DISTVERSIONSUFFIX=	-g${GL_COMMIT:C/(.{12}).*/\1/}
+CATEGORIES=	x11-servers
+PKGNAMESUFFIX=	-devel
+
+PATCH_SITES=	${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/commit/
+PATCHFILES+=	71749de24509.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393
+PATCHFILES+=	1e897704c822.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393
+PATCHFILES+=	83cda3ce3195.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/merge_requests/393
+
+MAINTAINER=	jbeich@FreeBSD.org
+COMMENT=	X11 server as Wayland client (development snapshot)
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
+		${LOCALBASE}/include/GL/internal/dri_interface.h:graphics/mesa-dri \
+		wayland-protocols>=1.18:graphics/wayland-protocols
+LIB_DEPENDS=	libdrm.so:graphics/libdrm \
+		libepoxy.so:graphics/libepoxy \
+		libwayland-client.so:graphics/wayland
+
+CONFLICTS_INSTALL=	${PORTNAME}
+
+USES=		gl meson pkgconfig xorg
+USE_GITLAB=	yes
+USE_GL=		gbm gl
+USE_XORG=	pixman xau xdmcp xfont2 xkbfile xshmfence xtrans
+GL_SITE=	https://gitlab.freedesktop.org
+GL_ACCOUNT=	xorg
+GL_PROJECT=	xserver
+GL_COMMIT=	1cfdd1a96580733df3625bcea3384ffee3dc92df
+MESON_ARGS=	-Dxwayland=true \
+		-Dxorg=false \
+		-Dxnest=false \
+		-Dxvfb=false \
+		-Dudev=false \
+		-Dudev_kms=false \
+		-Ddefault_font_path=${NONEXISTENT}
+PLIST_FILES=	bin/Xwayland
+
+do-install:
+# Wayland compositors only use the binary
+	${INSTALL_PROGRAM} ${BUILD_WRKSRC}/hw/xwayland/Xwayland \
+		${STAGEDIR}${PREFIX}/bin
+
+.include <bsd.port.mk>
diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo
new file mode 100644
index 000000000000..aca995d86731
--- /dev/null
+++ b/x11-servers/xwayland-devel/distinfo
@@ -0,0 +1,9 @@
+TIMESTAMP = 1580946307
+SHA256 (xorg-xserver-1cfdd1a96580733df3625bcea3384ffee3dc92df_GL0.tar.gz) = a3c2b610e7d442692b85460c791b37048bfd33a5f529d7f0538149c7f01dffc1
+SIZE (xorg-xserver-1cfdd1a96580733df3625bcea3384ffee3dc92df_GL0.tar.gz) = 5107900
+SHA256 (71749de24509.patch) = b541c7ca7098ed624e815f0dc17e94d1dc48e70af55459e51a8f04b10bcd0116
+SIZE (71749de24509.patch) = 1392
+SHA256 (1e897704c822.patch) = b5c9e98a8596d4aa854c817f2f44ed7636cbc32de6773ade20e03970deb70717
+SIZE (1e897704c822.patch) = 969
+SHA256 (83cda3ce3195.patch) = 4b0bfd42d558d6634dbac3105d5744c8cb2a8410f3572033fe45211fb8d1ae71
+SIZE (83cda3ce3195.patch) = 4513
diff --git a/x11-servers/xwayland-devel/pkg-descr b/x11-servers/xwayland-devel/pkg-descr
new file mode 100644
index 000000000000..5a4a3073275b
--- /dev/null
+++ b/x11-servers/xwayland-devel/pkg-descr
@@ -0,0 +1,10 @@
+Wayland is a complete window system in itself, but even so, if we're
+migrating away from X, it makes sense to have a good backwards
+compatibility story. With a few changes, the Xorg server can be
+modified to use wayland input devices for input and forward either the
+root window or individual top-level windows as wayland surfaces. The
+server still runs the same 2D driver with the same acceleration code
+as it does when it runs natively. The main difference is that wayland
+handles presentation of the windows instead of KMS.
+
+WWW: https://wayland.freedesktop.org/xserver.html
diff --git a/x11-servers/xwayland/Makefile b/x11-servers/xwayland/Makefile
index d929f631b54d..1b8ada2e0989 100644
--- a/x11-servers/xwayland/Makefile
+++ b/x11-servers/xwayland/Makefile
@@ -1,49 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	xwayland
 PORTVERSION=	1.19.1
 # This is inherited from x11-servers/xorg-server
 # Ensure it does not go backwards when bumping
 PORTREVISION=	11
 
 COMMENT=	X Clients under Wayland
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols \
 		${LOCALBASE}/include/linux/input.h:devel/evdev-proto
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 		libinput.so:x11/libinput
 
+CONFLICTS_INSTALL=	${PORTNAME}-devel
+
 MASTERDIR=	${.CURDIR}/../xorg-server
 DESCR=		${.CURDIR}/pkg-descr
 DISTINFO_FILE=	${.CURDIR}/distinfo
 PATCHDIR=	${.CURDIR}/files
 
 SLAVE_PORT=	yes
 OPTIONS_EXCLUDE=DEVD HAL SUID UDEV
 
 USE_XORG=	x11 xext xfont2
 USE_GL+=	egl gbm
 
 CONFIGURE_ARGS+=	--disable-docs --disable-devel-docs \
 			--enable-xwayland --disable-xorg --disable-xvfb --disable-xnest \
 			--disable-xquartz --disable-xwin
 
 PLIST_FILES=	bin/Xwayland
 
 EXTRA_PATCHES=	${MASTERDIR}/files/patch-CVE-2017-12176 \
 		${MASTERDIR}/files/patch-CVE-2017-12177 \
 		${MASTERDIR}/files/patch-CVE-2017-12178 \
 		${MASTERDIR}/files/patch-CVE-2017-12179 \
 		${MASTERDIR}/files/patch-CVE-2017-12183 \
 		${MASTERDIR}/files/patch-CVE-2017-1218x \
 		${MASTERDIR}/files/patch-CVE-2017-1218y \
 		${MASTERDIR}/files/patch-CVE-2017-13721 \
 		${MASTERDIR}/files/patch-CVE-2017-13723 \
 		${MASTERDIR}/files/patch-os_io.c
 
 do-install:
 	cd ${WRKSRC}/hw/xwayland; DESTDIR=${STAGEDIR} ${MAKE_CMD} install
 
 .include "${MASTERDIR}/Makefile"