diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index 520b57e637a2..416a61e6e8ea 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -22,7 +22,21 @@ LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		liboauth.so:net/liboauth
 
 USES=		gettext gnome localbase meson pkgconfig tar:xz
-USE_GNOME=	glib20 introspection:build libxml2
+USE_GNOME=	glib20 libxml2
 USE_LDCONFIG=	yes
 
+.if "${WITHOUT_GIR}"
+CONFIGURE_ARGS+=-Dintrospection=false
+PLIST_SUB+=	GIR="@comment "
+.else
+USE_GNOME+=	build:introspection
+PLIST_SUB+=	GIR=
+.endif
+
+.if "${WITHOUT_VAPI}"
+PLIST_SUB+=	VAPI="@comment "
+.else
+PLIST_SUB+=	VAPI=
+.endif
+
 .include <bsd.port.mk>
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index 4009e5f668c7..58f251378542 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -105,12 +105,12 @@ include/libgdata/gdata/services/youtube/gdata-youtube-query.h
 include/libgdata/gdata/services/youtube/gdata-youtube-service.h
 include/libgdata/gdata/services/youtube/gdata-youtube-state.h
 include/libgdata/gdata/services/youtube/gdata-youtube-video.h
-lib/girepository-1.0/GData-0.0.typelib
+%%GIR%%lib/girepository-1.0/GData-0.0.typelib
 lib/libgdata.so
 lib/libgdata.so.22
 lib/libgdata.so.22.5.2
 libdata/pkgconfig/libgdata.pc
-share/gir-1.0/GData-0.0.gir
+%%GIR%%share/gir-1.0/GData-0.0.gir
 share/locale/ar/LC_MESSAGES/gdata.mo
 share/locale/as/LC_MESSAGES/gdata.mo
 share/locale/be/LC_MESSAGES/gdata.mo
@@ -174,5 +174,5 @@ share/locale/vi/LC_MESSAGES/gdata.mo
 share/locale/zh_CN/LC_MESSAGES/gdata.mo
 share/locale/zh_HK/LC_MESSAGES/gdata.mo
 share/locale/zh_TW/LC_MESSAGES/gdata.mo
-share/vala/vapi/libgdata.deps
-share/vala/vapi/libgdata.vapi
+%%VAPI%%share/vala/vapi/libgdata.deps
+%%VAPI%%share/vala/vapi/libgdata.vapi