diff --git a/share/config.fish b/share/config.fish
index 75d8cb478..689637d56 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -97,6 +97,10 @@ set -xg PATH $__fish_tmp_path
 set -e __fish_tmp_path
 functions -e __fish_load_path_helper_paths
 
+# Source any files matching /etc/profile.d/*.fish
+for file in /etc/profile.d/*.fish
+	source $file
+end
 
 # Add a handler for when fish_user_path changes, so we can apply the same changes to PATH
 # Invoke it immediately to apply the current value of fish_user_path