diff --git a/elements/flatpak/sdk.bst b/elements/flatpak/sdk.bst
index e83323f72bc0f68028dcf4caf94a8acb57f52580..a279810451b8c8c3a881534ca02b6523406ee05b 100644
--- a/elements/flatpak/sdk.bst
+++ b/elements/flatpak/sdk.bst
@@ -36,6 +36,7 @@ config:
       ALSA_CONFIG_PATH: /usr/share/alsa/alsa-flatpak.conf
       __EGL_EXTERNAL_PLATFORM_CONFIG_DIRS: /etc/egl/egl_external_platform.d:/usr/%{lib}/GL/egl/egl_external_platform.d:/usr/share/egl/egl_external_platform.d
       PYTHONUSERBASE: /var/data/python
+      DEBUGINFOD_URLS: 'https://debuginfod.gnome.org/'
 
     Extension org.gnome.Sdk.Debug:
       directory: lib/debug
diff --git a/elements/gnomeos-deps/debuginfod-config.bst b/elements/gnomeos-deps/debuginfod-config.bst
new file mode 100644
index 0000000000000000000000000000000000000000..43087124ffbc5f5a04e92168dcd4ca98c70d7980
--- /dev/null
+++ b/elements/gnomeos-deps/debuginfod-config.bst
@@ -0,0 +1,8 @@
+kind: import
+
+sources:
+- kind: local
+  path: files/environment.d/90-debuginfod.conf
+
+config:
+  target: "%{indep-libdir}/environment.d/90-debuginfod.conf"
diff --git a/elements/gnomeos-deps/deps.bst b/elements/gnomeos-deps/deps.bst
index d15d0436eface4d609931feea878dc1e42f8c480..43b904e95396bd2da3a26391b85c1ed09e49aa11 100644
--- a/elements/gnomeos-deps/deps.bst
+++ b/elements/gnomeos-deps/deps.bst
@@ -33,6 +33,7 @@ depends:
 - gnomeos-deps/vte-config.bst
 - gnomeos-deps/ld-config.bst
 - gnomeos-deps/modprobe-config.bst
+- gnomeos-deps/debuginfod-config.bst
 
 - gnomeos-deps/alsa-ucm-conf.bst
 - gnomeos-deps/android-udev-rules.bst
diff --git a/files/environment.d/90-debuginfod.conf b/files/environment.d/90-debuginfod.conf
new file mode 100644
index 0000000000000000000000000000000000000000..c7c1aea51e12d5eab803e80aa278d9035afd6ac9
--- /dev/null
+++ b/files/environment.d/90-debuginfod.conf
@@ -0,0 +1,3 @@
+# Debuginfod has a drop-in directory at /etc/debuginfod/
+# However its only used by /etc/profile.d/debuginfod.sh which doesn't work with fish
+DEBUGINFOD_URLS='https://debuginfod.gnome.org/'