diff --git a/setup-run-from-source.tcsh b/setup-run-from-source.tcsh
index 9462b920..43a44293 100755
--- a/setup-run-from-source.tcsh
+++ b/setup-run-from-source.tcsh
@@ -1,7 +1,9 @@
 #!/bin/tcsh
 
+setenv PYTHONPATH `pwd`/p2p
+
 # for activity.py
-setenv PYTHONPATH `pwd`/shell/src/
+setenv PYTHONPATH "$PYTHONPATH":`pwd`/shell/src/
 
 # for sugar_globals.py
 setenv PYTHONPATH "$PYTHONPATH":`pwd`/