diff --git a/graphics/cairomm/Makefile b/graphics/cairomm/Makefile
index 236c51ff46ad..7a8f755d90ba 100644
--- a/graphics/cairomm/Makefile
+++ b/graphics/cairomm/Makefile
@@ -1,23 +1,37 @@
 PORTNAME=	cairomm
 DISTVERSION=	1.14.5
 CATEGORIES=	graphics
 MASTER_SITES=	http://cairographics.org/releases/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ interface to cairo
 WWW=		https://cairographics.org
 
 LICENSE=	LGPL20
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
-USES=		compiler:c++11-lang gnome meson pkgconfig tar:xz
+USES=		compiler:c++11-lang gnome meson pkgconfig tar:xz xorg
 USE_GNOME=	cairo libsigc++20
 USE_XORG=	x11 xext xrender
 USE_LDCONFIG=	yes
 
 MESON_ARGS=	-Dbuild-examples=false \
 		-Dbuild-tests=false
 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-1.0
+PORTDOCS=	*
+
+OPTIONS_DEFINE=		DOCS TEST
+
+DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			xsltproc:textproc/libxslt
+DOCS_USES=		perl5
+DOCS_USE=		perl5=build
+DOCS_MESON_TRUE=	build-documentation
+
+TEST_LIB_DEPENDS=	libboost_unit_test_framework.so:devel/boost-libs
+TEST_MESON_TRUE=	build-tests
+
 .include <bsd.port.mk>
diff --git a/graphics/cairomm/pkg-plist b/graphics/cairomm/pkg-plist
index d3e968bbbc61..ebb5f1d6840b 100644
--- a/graphics/cairomm/pkg-plist
+++ b/graphics/cairomm/pkg-plist
@@ -1,34 +1,35 @@
 include/cairomm-1.0/cairomm/cairomm.h
 include/cairomm-1.0/cairomm/context.h
 include/cairomm-1.0/cairomm/device.h
 include/cairomm-1.0/cairomm/enums.h
 include/cairomm-1.0/cairomm/exception.h
 include/cairomm-1.0/cairomm/fontface.h
 include/cairomm-1.0/cairomm/fontoptions.h
 include/cairomm-1.0/cairomm/matrix.h
 include/cairomm-1.0/cairomm/path.h
 include/cairomm-1.0/cairomm/pattern.h
 include/cairomm-1.0/cairomm/quartz_font.h
 include/cairomm-1.0/cairomm/quartz_surface.h
 include/cairomm-1.0/cairomm/refptr.h
 include/cairomm-1.0/cairomm/region.h
 include/cairomm-1.0/cairomm/scaledfont.h
 include/cairomm-1.0/cairomm/script.h
 include/cairomm-1.0/cairomm/script_surface.h
 include/cairomm-1.0/cairomm/surface.h
 include/cairomm-1.0/cairomm/types.h
 include/cairomm-1.0/cairomm/win32_font.h
 include/cairomm-1.0/cairomm/win32_surface.h
 include/cairomm-1.0/cairomm/xlib_surface.h
 lib/cairomm-1.0/include/cairommconfig.h
 lib/libcairomm-1.0.so
 lib/libcairomm-1.0.so.1
 lib/libcairomm-1.0.so.1.4.0
 libdata/pkgconfig/cairomm-1.0.pc
 libdata/pkgconfig/cairomm-ft-1.0.pc
 libdata/pkgconfig/cairomm-pdf-1.0.pc
 libdata/pkgconfig/cairomm-png-1.0.pc
 libdata/pkgconfig/cairomm-ps-1.0.pc
 libdata/pkgconfig/cairomm-svg-1.0.pc
 libdata/pkgconfig/cairomm-xlib-1.0.pc
 libdata/pkgconfig/cairomm-xlib-xrender-1.0.pc
+share/devhelp/books/cairomm-1.0/cairomm-1.0.devhelp2