diff --git a/x11-toolkits/libdecor/Makefile b/x11-toolkits/libdecor/Makefile
index 4bad8153f93d..68a2bbfd3320 100644
--- a/x11-toolkits/libdecor/Makefile
+++ b/x11-toolkits/libdecor/Makefile
@@ -1,55 +1,64 @@
 PORTNAME=	libdecor
 DISTVERSION=	0.2.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Client-side decorations library for Wayland client
 WWW=		https://gitlab.freedesktop.org/libdecor/libdecor
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	wayland-protocols>=1.15:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland
 
 USES=		meson pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_SITE=	https://gitlab.freedesktop.org
-MESON_ARGS=	-Ddemo=false
 
-OPTIONS_DEFINE=	CAIRO DBUS GTK3
+OPTIONS_DEFINE=	EXAMPLES CAIRO DBUS GTK3
 OPTIONS_DEFAULT=CAIRO DBUS GTK3
 OPTIONS_SUB=	yes
 
 CAIRO_SUBPACKAGES=	cairo
 CAIRO_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 #USES.cairo=		gnome
 #USE_GNOME.cairo=	cairo pango
 LIB_DEPENDS.cairo=	libgobject-2.0.so:devel/glib20 \
 			libcairo.so:graphics/cairo \
 			libpango-1.0.so:x11-toolkits/pango
 SELF_DEPENDS.cairo=	main
 
 # Unused by the main library
 LIB_DEPENDS.cairo+=	${"${PORT_OPTIONS:MDBUS}":?libdbus-1.so\:devel/dbus:}
+LIB_DEPENDS.examples+=	${"${PORT_OPTIONS:MDBUS}":?libdbus-1.so\:devel/dbus:}
 LIB_DEPENDS.gtk3+=	${"${PORT_OPTIONS:MDBUS}":?libdbus-1.so\:devel/dbus:}
 DBUS_MESON_ENABLED=	dbus
 
+EXAMPLES_SUBPACKAGES=	examples
+EXAMPLES_MESON_TRUE=	demo install_demo
+EXAMPLES_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
+LIB_DEPENDS.examples+=	libxkbcommon.so:x11/libxkbcommon
+#USES.examples=		gl
+#USE_GL.examples=	egl opengl
+LIB_DEPENDS.examples+=	libEGL.so:graphics/libglvnd
+SELF_DEPENDS.examples=	main
+
 GTK3_SUBPACKAGES=	gtk3
 GTK3_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 #USES.gtk3=		gnome
 #USE_GNOME.gtk3=		cairo gtk30
 LIB_DEPENDS.gtk3+=	libglib-2.0.so:devel/glib20 \
 			libcairo.so:graphics/cairo \
 			libgtk-3.so:x11-toolkits/gtk30
 SELF_DEPENDS.gtk3=	main
 GTK3_MESON_ENABLED=	gtk
 
 post-patch-CAIRO-off:
 	@${REINPLACE_CMD} '/cairo/d' ${WRKSRC}/src/plugins/meson.build
 	@${REINPLACE_CMD} "s/'cairo'/&, required: false, disabler: true/" \
 		${WRKSRC}/src/plugins/common/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libdecor/pkg-descr.examples b/x11-toolkits/libdecor/pkg-descr.examples
new file mode 100644
index 000000000000..05d84930c209
--- /dev/null
+++ b/x11-toolkits/libdecor/pkg-descr.examples
@@ -0,0 +1,5 @@
+libdecor is a library that can help Wayland clients draw window
+decorations for them. It aims to provide multiple backends that
+implements the decoration drawing.
+
+This package provides libdecor demo programs.
diff --git a/x11-toolkits/libdecor/pkg-plist b/x11-toolkits/libdecor/pkg-plist
index 4851ff6605b2..13954b500574 100644
--- a/x11-toolkits/libdecor/pkg-plist
+++ b/x11-toolkits/libdecor/pkg-plist
@@ -1,7 +1,10 @@
+%%EXAMPLES%%@@examples@@bin/libdecor-c++-demo
+%%EXAMPLES%%@@examples@@bin/libdecor-demo
+%%EXAMPLES%%@@examples@@bin/libdecor-egl
 include/libdecor-0/libdecor.h
 lib/libdecor-0.so
 lib/libdecor-0.so.0
 lib/libdecor-0.so.0.200.2
 %%CAIRO%%@@cairo@@lib/libdecor/plugins-1/libdecor-cairo.so
 %%GTK3%%@@gtk3@@lib/libdecor/plugins-1/libdecor-gtk.so
 libdata/pkgconfig/libdecor-0.pc