diff --git a/tools/chibi-run b/tools/chibi-run
index aceb1a3c..f40746ae 100755
--- a/tools/chibi-run
+++ b/tools/chibi-run
@@ -1 +1,3 @@
-LD_LIBRARY_PATH=.: DYLD_LIBRARY_PATH=.: CHIBI_MODULE_PATH=lib ./chibi-scheme "$@"
+#!/bin/sh
+DIR="$(dirname "$0")/.."
+LD_LIBRARY_PATH="$DIR": DYLD_LIBRARY_PATH="$DIR": CHIBI_MODULE_PATH="$DIR"/lib "$DIR"/chibi-scheme "$@"