diff --git a/x11-toolkits/libhandy/Makefile b/x11-toolkits/libhandy/Makefile
index 62ce5339cbcc..e69943f07654 100644
--- a/x11-toolkits/libhandy/Makefile
+++ b/x11-toolkits/libhandy/Makefile
@@ -19,4 +19,37 @@ USE_GNOME=	cairo gdkpixbuf2 gtk30 introspection:build
 USE_LDCONFIG=	yes
 MESON_ARGS=	-Dtests=false
 
+OPTIONS_DEFINE=		DOCS EXAMPLES GLADE
+OPTIONS_DEFAULT=	GLADE
+OPTIONS_SUB=		yes
+
+DOCS_MESON_TRUE=	gtk_doc
+DOCS_USES=		python
+DOCS_BUILD_DEPENDS=	gi-docgen:textproc/py-gi-docgen@${PY_FLAVOR} \
+			gtkdoc-mkhtml:textproc/gtk-doc
+
+GLADE_DESC=		Build and install Glade catalog
+GLADE_MESON_ENABLED=	glade_catalog
+
+EXAMPLES_MESON_TRUE=	examples
+
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-1
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}
+
+post-stage-DOCS-on:
+	${INSTALL_MAN} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
+
+post-stage-EXAMPLES-on:
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/examples; ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR} \
+		"! -name *\.bak ! -name *\.orig"
+
+add-plist-docs: ${STAGE_COOKIE}
+	cd ${STAGEDIR}; ${FIND} ${DOCSDIR:C@^/@@} -type f | \
+		${SED} -e 's@^@/@' >> ${TMPPLIST}
+
+add-plist-examples: ${STAGE_COOKIE}
+	cd ${STAGEDIR}; ${FIND} ${EXAMPLESDIR:C@^/@@} -type f | \
+		${SED} -e 's@^@/@' >> ${TMPPLIST}
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libhandy/pkg-plist b/x11-toolkits/libhandy/pkg-plist
index 8f2d45d33152..16e912c62281 100644
--- a/x11-toolkits/libhandy/pkg-plist
+++ b/x11-toolkits/libhandy/pkg-plist
@@ -43,12 +43,12 @@ include/libhandy-1/hdy-view-switcher.h
 include/libhandy-1/hdy-window-handle.h
 include/libhandy-1/hdy-window.h
 lib/girepository-1.0/Handy-1.typelib
-lib/glade/modules/libglade-handy-1.so
+%%GLADE%%lib/glade/modules/libglade-handy-1.so
 lib/libhandy-1.so
 lib/libhandy-1.so.0
 libdata/pkgconfig/libhandy-1.pc
 share/gir-1.0/Handy-1.gir
-share/glade/catalogs/libhandy-1.xml
+%%GLADE%%share/glade/catalogs/libhandy-1.xml
 share/locale/ca/LC_MESSAGES/libhandy.mo
 share/locale/cs/LC_MESSAGES/libhandy.mo
 share/locale/de/LC_MESSAGES/libhandy.mo