diff --git a/x11-toolkits/libdecor/Makefile b/x11-toolkits/libdecor/Makefile
--- a/x11-toolkits/libdecor/Makefile
+++ b/x11-toolkits/libdecor/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libdecor
 DISTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -9,13 +10,16 @@
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+SUBPACKAGES=	pango
+
 BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 		wayland-protocols>=1.15:graphics/wayland-protocols
 LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+SELF_DEPENDS.pango=	main
 
 USES=		gnome meson pkgconfig
 USE_GITLAB=	yes
-USE_GNOME=	cairo pango
+#USE_GNOME.pango=cairo pango
 USE_LDCONFIG=	yes
 GL_SITE=	https://gitlab.freedesktop.org
 MESON_ARGS=	-Ddemo=false
@@ -24,10 +28,18 @@
 OPTIONS_DEFAULT=DBUS GTK3
 OPTIONS_SUB=	yes
 
-DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
+LIB_DEPENDS.pango=	libdbus-1.so:devel/dbus
+LIB_DEPENDS.gtk3=	${LIB_DEPENDS.pango}
 DBUS_MESON_ENABLED=	dbus
 
-GTK3_USE=		GNOME=gtk30
+# XXX Drop after uncommenting USE_GNOME.pango
+LIB_DEPENDS.pango+=	libcairo.so:graphics/cairo \
+			libpango-1.0.so:x11-toolkits/pango
+
+GTK3_SUBPACKAGES=	gtk3
+#USE_GNOME.gtk3=		gtk30
+LIB_DEPENDS.gtk3+=	libgtk-3.so:x11-toolkits/gtk30
+SELF_DEPENDS.gtk3=	main
 GTK3_MESON_ENABLED=	gtk
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libdecor/pkg-message b/x11-toolkits/libdecor/pkg-message
new file mode 100644
--- /dev/null
+++ b/x11-toolkits/libdecor/pkg-message
@@ -0,0 +1,10 @@
+[
+{ type: upgrade
+  maximum_version: "0.2.2"
+  message: <<EOD
+Plugins with extra dependencies moved into subpackages:
+- libdecor-pango
+- libdecor-gtk3
+EOD
+}
+]
diff --git a/x11-toolkits/libdecor/pkg-plist b/x11-toolkits/libdecor/pkg-plist
--- a/x11-toolkits/libdecor/pkg-plist
+++ b/x11-toolkits/libdecor/pkg-plist
@@ -2,6 +2,6 @@
 lib/libdecor-0.so
 lib/libdecor-0.so.0
 lib/libdecor-0.so.0.200.2
-lib/libdecor/plugins-1/libdecor-cairo.so
-%%GTK3%%lib/libdecor/plugins-1/libdecor-gtk.so
+@@pango@@lib/libdecor/plugins-1/libdecor-cairo.so
+@@gtk3@@lib/libdecor/plugins-1/libdecor-gtk.so
 libdata/pkgconfig/libdecor-0.pc