diff --git a/shell/Makefile.am b/shell/Makefile.am
index 28b76742..1b0c39c1 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -1,10 +1,10 @@
 SUBDIRS = conf data model view
 
 bin_SCRIPTS = 				\
-	sugar-shell			\
 	sugar-activity			\
 	sugar-activity-factory		\
-	sugar-console
+	sugar-log-viewer		\
+	sugar-shell
 
 sugardir = $(pkgdatadir)/shell
 sugar_PYTHON =				\
diff --git a/shell/view/ConsoleWindow.py b/shell/view/ConsoleWindow.py
deleted file mode 100644
index ef8ff650..00000000
--- a/shell/view/ConsoleWindow.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright (C) 2006, Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-import logging
-
-import gtk
-import dbus
-import dbus.service
-
-class Console(gtk.ScrolledWindow):
-	def __init__(self):
-		gtk.ScrolledWindow.__init__(self)
-
-		self._show_debug = False
-
-		self.set_policy(gtk.POLICY_AUTOMATIC,
-					    gtk.POLICY_AUTOMATIC)
-
-		self._textview = gtk.TextView()
-		self._textview.set_wrap_mode(gtk.WRAP_WORD)
-		self.add(self._textview)
-		self._textview.show()
-
-		buf = self._textview.get_buffer()
-		self._debug_tag = buf.create_tag("debug")
-		self._debug_tag.set_property("invisible", True)
-
-	def get_show_debug(self):
-		return self._show_debug
-
-	def set_show_debug(self, show_debug):
-		self._show_debug = show_debug
-		self._debug_tag.set_property("invisible", not show_debug)
-
-	def log(self, level, message):
-		msg = message + '\n'
-		buf = self._textview.get_buffer()
-		it = buf.get_end_iter()
-
-		if level == logging.DEBUG:
-			buf.insert_with_tags(it, msg, self._debug_tag)
-		else:
-			buf.insert(it, msg)
-
-class ConsoleDbusService(dbus.service.Object):
-	def __init__(self, console, bus_name):
-		dbus.service.Object.__init__(self, bus_name, '/org/laptop/Sugar/Console')
-		self._console = console
-
-	@dbus.service.method('org.laptop.Sugar.Console',
-						 in_signature="saias", out_signature="")
-	def log(self, module_id, levels, messages):
-		self._console.log(module_id, levels, messages)
-
-class ConsoleWindow(gtk.Window):
-	def __init__(self):
-		gtk.Window.__init__(self)
-
-		self.set_default_size(620, 440)
-		self.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
-		self.set_title("Console")
-		self.connect("delete_event", lambda w, e: w.hide_on_delete())
-
-		vbox = gtk.VBox()
-
-		toolbar = gtk.Toolbar()
-
-		self._debug_toggle = gtk.ToggleToolButton()
-		self._debug_toggle.connect('toggled', self.__debug_toggled_cb)
-		self._debug_toggle.set_label('Debug')
-		toolbar.insert(self._debug_toggle, -1)
-		self._debug_toggle.show()
-
-		self._ignore_toggle = False
-
-		vbox.pack_start(toolbar, False)
-		toolbar.show()
-
-		self._nb = gtk.Notebook()
-		self._nb.connect('switch-page', self.__page_changed_cb)
-		vbox.pack_start(self._nb)
-		self._nb.show()
-
-		self.add(vbox)
-		vbox.show()
-
-		self._consoles = {}
-
-		session_bus = dbus.SessionBus()
-		bus_name = dbus.service.BusName('org.laptop.Sugar.Console', bus=session_bus)
-		ConsoleDbusService(self, bus_name)
-
-	def _add_console(self, page_id):
-		console = Console()
-		page = self._nb.append_page(console, gtk.Label(page_id))
-		console.show()
-
-		self._consoles[page_id] = console
-
-		return console
-
-	def _get_console(self, page_id):
-		if not self._consoles.has_key(page_id):
-			console = self._add_console(page_id)
-		else:
-			console = self._consoles[page_id]
-		return console
-
-	def __debug_toggled_cb(self, button):
-		if not self._ignore_toggle:
-			console = self._nb.get_nth_page(self._nb.get_current_page())
-			if console:
-				console.set_show_debug(button.get_active())
-
-	def __page_changed_cb(self, notebook, page, page_num):
-		console = self._nb.get_nth_page(page_num)
-
-		self._ignore_toggle = True
-		self._debug_toggle.set_active(console.get_show_debug())
-		self._ignore_toggle = False
-
-	def set_page(self, page_id):
-		page = self._nb.page_num(self._consoles[page_id])
-		self._nb.set_current_page(page)
-
-	def log(self, page_id, levels, messages):
-		console = self._get_console(page_id)
-		i = 0
-		while i < len(levels):
-			console.log(levels[i], messages[i])
-			i += 1