diff --git a/browser/browser.py b/browser/browser.py
index 91386f28..47026970 100755
--- a/browser/browser.py
+++ b/browser/browser.py
@@ -11,7 +11,7 @@ import gtk
 import geckoembed
 
 import sys
-import activity
+from sugar import activity
 
 from sugar_globals import *
 
diff --git a/chat/chat.py b/chat/chat.py
index 0df3a11a..17391adf 100755
--- a/chat/chat.py
+++ b/chat/chat.py
@@ -14,7 +14,7 @@ import os
 import pwd
 import socket
 
-import activity
+from sugar import activity
 
 import presence
 import BuddyList
diff --git a/setup-run-from-source.tcsh b/setup-run-from-source.tcsh
new file mode 100755
index 00000000..9462b920
--- /dev/null
+++ b/setup-run-from-source.tcsh
@@ -0,0 +1,7 @@
+#!/bin/tcsh
+
+# for activity.py
+setenv PYTHONPATH `pwd`/shell/src/
+
+# for sugar_globals.py
+setenv PYTHONPATH "$PYTHONPATH":`pwd`/