diff --git a/glib/meson.build b/glib/meson.build
index 6869a722d..93fa5049a 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -452,6 +452,13 @@ configure_file(
 
 install_data('glib_gdb.py', install_dir : join_paths(glib_pkgdatadir, 'gdb'))
 
+# This is needed to make gdb find glib_gdb.py
+if meson.version().version_compare('>=0.58')
+  env = environment()
+  env.prepend('PYTHONPATH', meson.current_source_dir())
+  meson.add_devenv(env)
+endif
+
 gdb_conf = configuration_data()
 gdb_conf.set('datadir', glib_datadir)
 # This is also used in gobject/meson.build
diff --git a/gobject/meson.build b/gobject/meson.build
index 74feb09d9..026a0351e 100644
--- a/gobject/meson.build
+++ b/gobject/meson.build
@@ -170,6 +170,13 @@ configure_file(
   install: gdb_install,
 )
 
+# This is needed to make gdb find gobject_gdb.py
+if meson.version().version_compare('>=0.58')
+  env = environment()
+  env.prepend('PYTHONPATH', meson.current_source_dir())
+  meson.add_devenv(env)
+endif
+
 if enable_systemtap
   gobject_stp = configure_file(input : 'gobject.stp.in',
     output : '@0@.stp'.format(libgobject.full_path().split('/').get(-1)),