diff --git a/basis/gobject-introspection/gobject-introspection.factor b/basis/gobject-introspection/gobject-introspection.factor
index 3d380cb68b..7990ef5976 100755
--- a/basis/gobject-introspection/gobject-introspection.factor
+++ b/basis/gobject-introspection/gobject-introspection.factor
@@ -4,7 +4,7 @@ USING: accessors assocs combinators environment gobject-introspection.common
 gobject-introspection.ffi gobject-introspection.loader
 gobject-introspection.types io io.files io.pathnames kernel lexer
 locals make namespaces parser sequences splitting summary vocabs
-vocabs.parser xml ;
+vocabs.parser xdg xml ;
 IN: gobject-introspection
 
 ERROR: gir-not-found name paths ;
@@ -18,8 +18,7 @@ M: gir-not-found summary
 <PRIVATE
 
 : system-gir-dirs ( -- dirs )
-    "XDG_DATA_DIRS" os-env "/usr/local/share/:/usr/share/" or
-    ":" split [ "gir-1.0" append-path ] map ;
+    xdg-data-dirs [ "gir-1.0" append-path ] map ;
 
 : custom-gir-dirs ( -- dirs )
     "GIR_DIRS" os-env ":" split ;