diff --git a/bin/Makefile.am b/bin/Makefile.am
index f2f68d32..db5e2196 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,5 +1,7 @@
 bin_SCRIPTS = 			\
 	sugar			\
+	sugar-activity		\
+	sugar-activity-factory	\
 	sugar-install-bundle
 
 EXTRA_DIST =                    \
diff --git a/shell/sugar-activity b/bin/sugar-activity
similarity index 100%
rename from shell/sugar-activity
rename to bin/sugar-activity
diff --git a/shell/sugar-activity-factory b/bin/sugar-activity-factory
similarity index 100%
rename from shell/sugar-activity-factory
rename to bin/sugar-activity-factory
diff --git a/shell/Makefile.am b/shell/Makefile.am
index dfcbcc26..96bdf983 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,9 +1,6 @@
 SUBDIRS = hardware model view intro
 
-bin_SCRIPTS = 				\
-	sugar-activity			\
-	sugar-activity-factory		\
-	sugar-shell
+bin_SCRIPTS = sugar-shell
 
 sugardir = $(pkgdatadir)/shell
 sugar_PYTHON =				\