diff --git a/hacking/env-setup b/hacking/env-setup
index fcf8e4d049b..38c372a79ae 100755
--- a/hacking/env-setup
+++ b/hacking/env-setup
@@ -5,6 +5,8 @@
 # When run using source as directed, $0 gets set to bash, so we must use $BASH_SOURCE
 if [ -n "$BASH_SOURCE" ] ; then
     HACKING_DIR=`dirname $BASH_SOURCE`
+elif [ ${0:(-9)} = "env-setup" ]; then
+    HACKING_DIR=`dirname $0`
 else
     HACKING_DIR="$PWD/hacking"
 fi