diff --git a/docs/api/meson.build b/docs/api/meson.build
index 609e4ce84..6b3a0fa77 100644
--- a/docs/api/meson.build
+++ b/docs/api/meson.build
@@ -23,13 +23,13 @@ configure_file(
 content_files += join_paths(meson.source_root(), 'COPYING')
 filecopier = find_program('cp')
 foreach intro : introspection_files
-  path = intro.full_path().split('/')[-1]
+  path = intro[1].split('/')[-1]
   custom_target(path,
-                input: intro,
+                input: intro[0],
                 output: path,
-                command : [filecopier, '@INPUT@', '@OUTPUT@'],
+                command: [filecopier, intro[1], '@OUTPUT@'],
                 build_by_default: true,
-)
+  )
 endforeach
 
 custom_target('common.ent',
diff --git a/introspection/meson.build b/introspection/meson.build
index e442ac85f..631432a7a 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -73,13 +73,20 @@ foreach iface: ifaces
 
   sources += res
 
-  content_files += join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+  if gio_unix_dep.version().version_compare('>= 2.51.3')
+    dbus_iface_xml_path = join_paths(meson.current_build_dir(), 'dbus-' + iface_xml)
+  else
+    dbus_iface_xml_path = join_paths(meson.build_root(), 'dbus-' + iface_xml)
+  endif
+
+  content_files += dbus_iface_xml_path
 
   # res is an array only since 0.46. Documentation won't work with
   # older versions
   if meson.version().version_compare('>= 0.46.0')
-    introspection_files += res[2]
+    introspection_files += [ [res[2], dbus_iface_xml_path] ]
   endif
+
 endforeach
 
 install_data(