diff --git a/configure.ac b/configure.ac
index a32b2206..097cc0a5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar],[0.5],[],[sugar])
+AC_INIT([Sugar],[0.6],[],[sugar])
 
 AC_PREREQ([2.59])
 
@@ -21,6 +21,7 @@ sugar/Makefile
 sugar/__installed__.py
 sugar/browser/Makefile
 sugar/chat/Makefile
+sugar/chat/sketchpad/Makefile
 sugar/p2p/Makefile
 sugar/p2p/model/Makefile
 sugar/shell/Makefile
diff --git a/sugar/browser/Makefile.am b/sugar/browser/Makefile.am
index 4bf03d2a..7aacdd8a 100644
--- a/sugar/browser/Makefile.am
+++ b/sugar/browser/Makefile.am
@@ -16,4 +16,6 @@ activitydir = $(pkgdatadir)/activities
 activity_DATA = browser.activity
 
 EXTRA_DIST =			\
+	$(rc_DATA)		\
+	$(activity_DATA)	\
 	$(icon_DATA)
diff --git a/sugar/chat/Makefile.am b/sugar/chat/Makefile.am
index 4197815e..c43ba873 100644
--- a/sugar/chat/Makefile.am
+++ b/sugar/chat/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = sketchpad
+
 sugardir = $(pythondir)/sugar/chat
 sugar_PYTHON =		\
 	__init__.py	\
@@ -12,4 +14,6 @@ icon_DATA =			\
 activitydir = $(pkgdatadir)/activities
 activity_DATA = chat.activity
 
-EXTRA_DIST = $(icon_DATA)
+EXTRA_DIST = \
+	$(icon_DATA)		\
+	$(activity_DATA)
diff --git a/sugar/chat/sketchpad/SketchPad.py b/sugar/chat/sketchpad/SketchPad.py
index b937ceab..93193784 100644
--- a/sugar/chat/sketchpad/SketchPad.py
+++ b/sugar/chat/sketchpad/SketchPad.py
@@ -41,17 +41,22 @@ class SketchPad(gtk.DrawingArea):
 	def add_sketch(self, sketch):
 		self._sketches.append(sketch)
 	
+	def add_point(self, event):
+		if self._active_sketch:
+			self._active_sketch.add_point(event.x, event.y)	
+		self.window.invalidate_rect(None, False)
+	
 	def __button_press_cb(self, widget, event):
 		self._active_sketch = Sketch()
 		self.add_sketch(self._active_sketch)
+		self.add_point(event)
 	
 	def __button_release_cb(self, widget, event):
+		self.add_point(event)
 		self._active_sketch = None
 	
 	def __motion_notify_cb(self, widget, event):
-		if self._active_sketch:
-			self._active_sketch.add_point(event.x, event.y)
-		self.window.invalidate_rect(None, False)
+		self.add_point(event)
 	
 	def to_svg(self):
 		d = drawing()