diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 7f2b3f17a546..d9fb177145a6 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -24,7 +24,6 @@ USE_LDCONFIG=	yes
 USE_PERL5=	build
 USE_PYTHON=	py3kplist
 MESON_ARGS=	-Db_lundef=false \
-		-Ddefault_library=both \
 		-Dinstalled_tests=false \
 		-Dlibmount=disabled \
 		-Dselinux=disabled \
@@ -35,8 +34,8 @@ PORTSCOUT=	limitw:1,even
 _LIBVERSION=	0.6800.3
 PLIST_SUB=	LIBVERSION=${_LIBVERSION}
 
-OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS
-OPTIONS_DEFAULT=	MANPAGES
+OPTIONS_DEFINE=	DEBUG FAM_ALTBACKEND MANPAGES NLS STATIC TEST
+OPTIONS_DEFAULT=	MANPAGES STATIC
 OPTIONS_SUB=		yes
 
 FAM_ALTBACKEND_DESC=	Alternate file monitor backend
@@ -46,6 +45,13 @@ MANPAGES_BUILD_DEPENDS=	docbook-xml>4.1.2:textproc/docbook-xml \
 MANPAGES_USE=		GNOME=libxslt:build
 MANPAGES_MESON_TRUE=	man
 
+STATIC_MESON_ON=	-Ddefault_library=both
+STATIC_MESON_OFF=	-Ddefault_library=shared
+
+TEST_DEPENDS=		update-desktop-database:devel/desktop-file-utils \
+			update-mime-database:misc/shared-mime-info
+TEST_MESON_TRUE=	tests
+
 .include <bsd.port.pre.mk>
 
 # doesn't build yet
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index a292150ea817..5f8da19150ef 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -283,23 +283,23 @@ include/glib-2.0/gobject/gvaluearray.h
 include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/glib-2.0/include/glibconfig.h
-lib/libgio-2.0.a
+%%STATIC%%lib/libgio-2.0.a
 lib/libgio-2.0.so
 lib/libgio-2.0.so.0
 lib/libgio-2.0.so.%%LIBVERSION%%
-lib/libglib-2.0.a
+%%STATIC%%lib/libglib-2.0.a
 lib/libglib-2.0.so
 lib/libglib-2.0.so.0
 lib/libglib-2.0.so.%%LIBVERSION%%
-lib/libgmodule-2.0.a
+%%STATIC%%lib/libgmodule-2.0.a
 lib/libgmodule-2.0.so
 lib/libgmodule-2.0.so.0
 lib/libgmodule-2.0.so.%%LIBVERSION%%
-lib/libgobject-2.0.a
+%%STATIC%%lib/libgobject-2.0.a
 lib/libgobject-2.0.so
 lib/libgobject-2.0.so.0
 lib/libgobject-2.0.so.%%LIBVERSION%%
-lib/libgthread-2.0.a
+%%STATIC%%lib/libgthread-2.0.a
 lib/libgthread-2.0.so
 lib/libgthread-2.0.so.0
 lib/libgthread-2.0.so.%%LIBVERSION%%