diff --git a/Makefile.am b/Makefile.am
index 027fc63a..64267cea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 SUBDIRS = chat browser shell
 
+bin_SCRIPTS = sugar
+
 sugardir = $(pythondir)/sugar
 sugar_PYTHON =			\
 	__init__.py		\
diff --git a/chat/Makefile.am b/chat/Makefile.am
index 4970d207..6343f1e9 100644
--- a/chat/Makefile.am
+++ b/chat/Makefile.am
@@ -4,6 +4,7 @@ sugar_PYTHON =		\
 	chat.py		\
 	network.py	\
 	presence.py	\
+	p2p.py		\
 	richtext.py
 
 icondir = $(pkgdatadir)
diff --git a/sugar b/sugar
index 2c4f1052..960971c4 100755
--- a/sugar
+++ b/sugar
@@ -25,4 +25,4 @@ elif sys.argv[1] == 'browser':
 	import sugar.browser
 	sugar.browser.main()
 else:
-	print "Unkown activity"
+	print "Unknown activity"