diff --git a/ChangeLog b/ChangeLog
index 4511b92e82..99390ed709 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-01-06  Johan Dahlin  <johan@gnome.org>
+
+	Merged from trunk:
+
+	* gtk/gtk-builder-convert (GtkBuilderConverter._strip_root): 
+	Make sure that --root works for toplevel widgets.
+	(#491847, Phil Lello)
+
 2008-01-04  Michael Natterer  <mitch@imendio.com>
 
 	Merged from trunk:
diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
index f2a94098a5..8e5d0892a2 100755
--- a/gtk/gtk-builder-convert
+++ b/gtk/gtk-builder-convert
@@ -597,16 +597,11 @@ class GtkBuilderConverter(object):
             raise SystemExit("Could not find an object called `%s'" % (
                 root_name))
 
-        # If it's already a root object, don't do anything
-        if widget.parentNode is self._interface:
-            return
-
         for child in self._interface.childNodes[:]:
             if child.nodeType != Node.ELEMENT_NODE:
                 continue
             child.parentNode.removeChild(child)
 
-        widget.parentNode.removeChild(widget)
         self._interface.appendChild(widget)