diff --git a/gio/fam/meson.build b/gio/fam/meson.build
index 8019fe5c4..e3f57037c 100644
--- a/gio/fam/meson.build
+++ b/gio/fam/meson.build
@@ -34,3 +34,9 @@ module = shared_module('giofam', 'gfamfilemonitor.c',
 if not meson.is_cross_build()
   meson.add_install_script('../gio-querymodules-wrapper.py', gio_querymodules.full_path(), glib_giomodulesdir)
 endif
+
+if meson.version().version_compare('>=0.58')
+  env = environment()
+  env.prepend('GIO_EXTRA_MODULES', meson.current_build_dir())
+  meson.add_devenv(env)
+endif
\ No newline at end of file