diff --git a/bin/Makefile.am b/bin/Makefile.am
index fd72139b..327df30d 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -2,8 +2,10 @@ bin_SCRIPTS = 			\
 	sugar			\
 	sugar-activity		\
 	sugar-backup		\
+	sugar-control-panel	\
 	sugar-install-bundle	\
-	sugar-launch
+	sugar-launch		\
+	sugar-shell
 
 EXTRA_DIST = $(bin_SCRIPTS) sugar.in
 
diff --git a/shell/controlpanel/sugar-control b/bin/sugar-control-panel
similarity index 97%
rename from shell/controlpanel/sugar-control
rename to bin/sugar-control-panel
index 4bee092d..d978fed7 100755
--- a/shell/controlpanel/sugar-control
+++ b/bin/sugar-control-panel
@@ -17,8 +17,11 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-import getopt, sys
-    
+import sys
+import getopt
+
+sys.path.insert(0, env.get_shell_path())
+ 
 import control 
         
 def cmd_help():
diff --git a/shell/sugar-shell b/bin/sugar-shell
similarity index 100%
rename from shell/sugar-shell
rename to bin/sugar-shell
diff --git a/configure.ac b/configure.ac
index 78444554..01c5645c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ lib/sugar/datastore/Makefile
 services/Makefile
 services/shell/Makefile
 shell/Makefile
+shell/controlpanel/Makefile
 shell/intro/Makefile
 shell/hardware/Makefile
 shell/view/Makefile
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 56649bef..4c9eac9f 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,6 +1,4 @@
-SUBDIRS = hardware model view intro
-
-bin_SCRIPTS = sugar-shell
+SUBDIRS = controlpanel hardware model view intro
 
 sugardir = $(pkgdatadir)/shell
 sugar_PYTHON =			\
diff --git a/shell/controlpanel/Makefile.am b/shell/controlpanel/Makefile.am
new file mode 100644
index 00000000..353aeec0
--- /dev/null
+++ b/shell/controlpanel/Makefile.am
@@ -0,0 +1,2 @@
+sugardir = $(pkgdatadir)/shell/controlpanel
+sugar_PYTHON = control.py