diff --git a/init/fish.in b/init/fish.in
index c202caf37..efaa8a32f 100644
--- a/init/fish.in
+++ b/init/fish.in
@@ -15,7 +15,14 @@ set -g IFS \ \t\n
 # want this even for text-only terminals.
 #
 
-for i in /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin
+set -l path_list /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin
+
+set -l uid (id -u 2>/dev/null)
+if test "$uid" = 0
+	set path_list $path_list /sbin /usr/sbin /usr/local/sbin
+end
+
+for i in $path_list
 	if not expr "$PATH" : .\*$i.\* >/dev/null
 		if test -d $i
 			set PATH $PATH $i
@@ -24,6 +31,8 @@ for i in /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin
 end
 
 
+
+
 #
 # Set some value for LANG if nothing was set before
 #