diff --git a/girepository/meson.build b/girepository/meson.build
index a779d90cb..3a17cf5c8 100644
--- a/girepository/meson.build
+++ b/girepository/meson.build
@@ -182,7 +182,7 @@ if cc.get_id() != 'msvc'
   ])
 endif
 
-libgirepository = shared_library('girepository-2.0',
+libgirepository = library('girepository-2.0',
   sources: girepo_sources + girepo_ffi_sources + [gi_visibility_h],
   include_directories: [configinc, girepoinc],
   c_args: gir_c_args,
diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in
index 4e018a5f1..c6f79b2cd 100644
--- a/glib/glibconfig.h.in
+++ b/glib/glibconfig.h.in
@@ -16,6 +16,7 @@
 #mesondefine GOBJECT_STATIC_COMPILATION
 #mesondefine GIO_STATIC_COMPILATION
 #mesondefine GMODULE_STATIC_COMPILATION
+#mesondefine GI_STATIC_COMPILATION
 #mesondefine G_INTL_STATIC_COMPILATION
 #mesondefine FFI_STATIC_BUILD
 
diff --git a/meson.build b/meson.build
index cee1cab9d..130715aca 100644
--- a/meson.build
+++ b/meson.build
@@ -316,6 +316,7 @@ if glib_build_static_only
   glibconfig_conf.set('GOBJECT_STATIC_COMPILATION', '1')
   glibconfig_conf.set('GIO_STATIC_COMPILATION', '1')
   glibconfig_conf.set('GMODULE_STATIC_COMPILATION', '1')
+  glibconfig_conf.set('GI_STATIC_COMPILATION', '1')
   glibconfig_conf.set('G_INTL_STATIC_COMPILATION', '1')
   glibconfig_conf.set('FFI_STATIC_BUILD', '1')
 endif
diff --git a/tools/gen-visibility-macros.py b/tools/gen-visibility-macros.py
index a7a724816..ad37bafeb 100755
--- a/tools/gen-visibility-macros.py
+++ b/tools/gen-visibility-macros.py
@@ -81,7 +81,7 @@ def gen_visibility_macros(args, current_minor_version):
     - GLIB_UNAVAILABLE(maj,min)
     - GLIB_UNAVAILABLE_STATIC_INLINE(maj,min)
 
-    The GLIB namespace can be replaced with one of GOBJECT, GIO, GMODULE.
+    The GLIB namespace can be replaced with one of GOBJECT, GIO, GMODULE, GI.
     """
 
     ns = args.namespace