diff --git a/configure.ac b/configure.ac
index f98014159..6481f5d16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,8 +19,18 @@ for i in /usr/pkg /sw; do
     	AC_MSG_RESULT(no)
 	fi
 
+	AC_MSG_CHECKING([for $i/bin command directory])
+	if test -d $i/bin; then
+		AC_MSG_RESULT(yes)
+		optbindirs="$optbindirs $i/bin"
+	else
+    	AC_MSG_RESULT(no)
+	fi
+
 done
 
+AC_SUBST( optbindirs, $optbindirs )
+
 # If needed, run autoheader automatically
 AC_MSG_CHECKING([if autoheader needs to be run])
 if test ! -f ./config.h.in -o config.h.in -ot configure.ac; then
diff --git a/init/fish.in b/init/fish.in
index 15808f8cd..27b190124 100644
--- a/init/fish.in
+++ b/init/fish.in
@@ -15,7 +15,7 @@ set -g IFS \ \t\n
 # want this even for text-only terminals.
 #
 
-set -l path_list /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin
+set -l path_list /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin @optbindirs@
 
 # Root should also have the sbin directories in the path
 set -l uid (id -u 2>/dev/null)