diff --git a/env.bash b/env.bash
index 7837b2c..0c4d051 100644
--- a/env.bash
+++ b/env.bash
@@ -5,14 +5,20 @@
 HOSTARCH=`uname -m`
 DIR=`dirname "$BASH_SOURCE"`
 SELF=`basename "$BASH_SOURCE"`
+# OSX readlink doesn't support -f, but greadlink is the gnu version
+# that Linux uses
+READLINK=`which greadlink || which readlink`
 
 if [ "${BASH_SOURCE[0]}" = "${0}" ]; then
     echo "$SELF must be sourced, not executed"
     exit 1
 fi
 
-for p in `find $DIR -type d -wholename "$DIR/*-$OS-$HOSTARCH/bin"`;
+for p in `ls -d $DIR/*-$OS-$HOSTARCH | grep -v build`;
 do
-    echo "added $p";
-    export PATH=$p:$PATH;
+    if [ -d $p/bin ]; then
+        ABS_PATH=`$READLINK -f $p`
+        echo "added $ABS_PATH";
+        export PATH=$ABS_PATH/bin:$PATH;
+    fi
 done