diff --git a/sugar/browser/Makefile.am b/sugar/browser/Makefile.am
index d7e4b354..b4331778 100644
--- a/sugar/browser/Makefile.am
+++ b/sugar/browser/Makefile.am
@@ -1,5 +1,7 @@
 sugardir = $(pythondir)/sugar/browser
-sugar_PYTHON = browser.py
+sugar_PYTHON =		\
+	__init__.py	\
+	browser.py	
 
 icondir = $(pkgdatadir)
 icon_DATA =		\
diff --git a/sugar/browser/__init__.py b/sugar/browser/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/sugar/chat/Makefile.am b/sugar/chat/Makefile.am
index 4ddf6e96..0dbf1cb8 100644
--- a/sugar/chat/Makefile.am
+++ b/sugar/chat/Makefile.am
@@ -1,5 +1,6 @@
 sugardir = $(pythondir)/sugar/chat
 sugar_PYTHON =		\
+	__init__.py	\
 	chat.py		\
 	richtext.py
 
diff --git a/sugar/chat/__init__.py b/sugar/chat/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/sugar/env.py b/sugar/env.py
new file mode 100644
index 00000000..e30daa2d
--- /dev/null
+++ b/sugar/env.py
@@ -0,0 +1,9 @@
+import os
+
+try:
+	from sugar.__uninstalled__ import *
+except ImportError:
+	from sugar.__installed__ import *
+	
+def get_data_file(filename):
+	return internal_get_data_file(filename)