diff --git a/setup-run-from-source.sh b/setup-run-from-source.sh
index 40a10508..69a68477 100755
--- a/setup-run-from-source.sh
+++ b/setup-run-from-source.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
 # for activity.py
-export PYTHON_PATH=`pwd`/shell/src/
+export PYTHONPATH=`pwd`/shell/src/
+
+# for sugar_globals.py
+export PYTHONPATH=$PYTHONPATH:`pwd`/