diff --git a/sugar/Makefile.am b/sugar/Makefile.am
index 7293e3c3..626a56b0 100644
--- a/sugar/Makefile.am
+++ b/sugar/Makefile.am
@@ -1,10 +1,11 @@
-SUBDIRS = chat browser shell
+SUBDIRS = chat browser p2p shell
 
 bin_SCRIPTS = sugar
 
 sugardir = $(pythondir)/sugar
 sugar_PYTHON =			\
 	__init__.py		\
-	__installed__.py
+	__installed__.py	\
+	env.py
 
-EXTRA_DIST = sugar
+EXTRA_DIST = sugar __uninstalled__.py
diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in
index 717669d8..7e7352f0 100644
--- a/sugar/__installed__.py.in
+++ b/sugar/__installed__.py.in
@@ -1,2 +1,4 @@
+import os
+
 def internal_get_data_file(filename):
-	return "@prefix@/share/sugar"
+	return os.path.join('@prefix@/share/sugar', filename)