diff --git a/lib/sugar/activity/activity.py b/lib/sugar/activity/activity.py
index b4c96841..731a88aa 100644
--- a/lib/sugar/activity/activity.py
+++ b/lib/sugar/activity/activity.py
@@ -488,7 +488,8 @@ class Activity(Window, gtk.Container):
             if self._jobject.file_path:
                 self.write_file(self._jobject.file_path)
             else:
-                file_path = os.path.join(tempfile.gettempdir(), '%i' % time.time())
+                file_path = os.path.join(self.get_activity_root(), 'tmp',
+                                         '%i' % time.time())
                 self.write_file(file_path)
                 self._owns_file = True
                 self._jobject.file_path = file_path
diff --git a/lib/sugar/graphics/Makefile.am b/lib/sugar/graphics/Makefile.am
index df2f472c..f1db8927 100644
--- a/lib/sugar/graphics/Makefile.am
+++ b/lib/sugar/graphics/Makefile.am
@@ -4,6 +4,7 @@ sugar_PYTHON =			\
         alert.py                \
 	animator.py		\
 	combobox.py		\
+	composite.py		\
 	entry.py		\
 	icon.py			\
 	iconentry.py          	\
@@ -14,6 +15,7 @@ sugar_PYTHON =			\
 	palette.py		\
 	palettegroup.py		\
 	panel.py		\
+	render.py		\
 	roundbox.py		\
 	spreadlayout.py		\
 	style.py		\
@@ -23,4 +25,5 @@ sugar_PYTHON =			\
 	toolcombobox.py		\
 	tray.py			\
 	window.py		\
+	x11.py			\
 	xocolor.py