diff --git a/x11-servers/Makefile b/x11-servers/Makefile
index 996f9657edd6..305338da9ffb 100644
--- a/x11-servers/Makefile
+++ b/x11-servers/Makefile
@@ -1,10 +1,11 @@
     COMMENT = X11 servers
 
     SUBDIR += Xfstt
     SUBDIR += x2vnc
     SUBDIR += x2x
     SUBDIR += xarcan
+    SUBDIR += xlibre-ephyr
     SUBDIR += xorg-server
     SUBDIR += xwayland
 
 .include <bsd.port.subdir.mk>
diff --git a/x11-servers/xlibre-ephyr/Makefile b/x11-servers/xlibre-ephyr/Makefile
new file mode 100644
index 000000000000..949a278a6b74
--- /dev/null
+++ b/x11-servers/xlibre-ephyr/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	xlibre-ephyr
+PORTVERSION=	${XLIBRE_VER}
+CATEGORIES=	x11-servers
+
+MAINTAINER=	b-aazbsd@proton.me
+COMMENT=	Xlibre Xephyr server
+WWW=		https://github.com/X11Libre/xserver/
+
+LICENSE=	MIT
+
+CONFLICTS_INSTALL=	xephyr
+
+USES+=		xlibre-cat:server
+USE_XORG+=xcb
+
+MESON_ARGS+=	-Dglamor=true
+LIB_DEPENDS+=	libepoxy.so:graphics/libepoxy
+
+LIB_DEPENDS+=	libxcb-render-util.so:x11/xcb-util-renderutil \
+		libxcb-image.so:x11/xcb-util-image \
+		libxcb-icccm.so:x11/xcb-util-wm \
+		libxcb-keysyms.so:x11/xcb-util-keysyms \
+		libxcb-util.so:x11/xcb-util
+
+.include "../xlibre-server/Makefile.common"
diff --git a/x11-servers/xlibre-ephyr/pkg-descr b/x11-servers/xlibre-ephyr/pkg-descr
new file mode 100644
index 000000000000..29bfa7d93fb0
--- /dev/null
+++ b/x11-servers/xlibre-ephyr/pkg-descr
@@ -0,0 +1,3 @@
+Xephyr is a kdrive server that outputs to a window on a pre-existing
+'host' X display. Think Xnest but with support for modern extensions
+like composite, damage and randr.