diff --git a/bin/xt-install-image b/bin/xt-install-image
index 1e14f11..a38993d 100755
--- a/bin/xt-install-image
+++ b/bin/xt-install-image
@@ -79,7 +79,7 @@ Install the distribution specified by the B<--dist> argument using the debootstr
  --
  http://www.steve.org.uk/
 
- $Id: xt-install-image,v 1.20 2006-08-14 20:55:29 steve Exp $
+ $Id: xt-install-image,v 1.21 2006-08-15 17:34:23 steve Exp $
 
 =cut
 
@@ -233,7 +233,7 @@ sub parseCommandLineArguments
 
     if ( $VERSION )
     {
-       my $REVISION      = '$Revision: 1.20 $';
+       my $REVISION      = '$Revision: 1.21 $';
 
        if ( $REVISION =~ /1.([0-9.]+) / )
        {
@@ -399,7 +399,7 @@ sub installDebootstrapImage
     #
     #  This is the command we'll run
     #
-    my $command = "/usr/sbin/debootstrap $VERBOSE $CONFIG{'dist'} $CONFIG{'location'} $CONFIG{'mirror'}";
+    my $command = "/usr/sbin/debootstrap --keep-debootstrap-dir $VERBOSE $CONFIG{'dist'} $CONFIG{'location'} $CONFIG{'mirror'}";
 
     #
     #  Run the command.
@@ -409,6 +409,16 @@ sub installDebootstrapImage
     #
     runCommand( $command );
 
+    #
+    #  Since we used the '--keep-debootstrap-dir' argument we'll have
+    # a /debootstrap/ directory maintained on the new guest.
+    #
+    #  If we got this far then the debootstrap command invokation succeeded
+    # and we can remove it.
+    #
+    system( "/bin/rm", "-rf", $CONFIG{'location'} . "/debootstrap" );
+
+
     #
     #  Cache from host -> new installation if we've got caching
     # enabled.
diff --git a/debian/changelog b/debian/changelog
index ba1c794..ef6d4ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,15 @@
 xen-tools (2.3-0) unstable; urgency=low
 
   * Better manpage for xen-create-image.
-    - No longer display internal functions in any manpages.
+    - No longer display internal functions in our manpages.
     (Closes: #383032)
   * Add support for using a user-selected Xen configuration file template
     via "--template=xx"
     (Closes: #383036)
   * Allow new images to be created without swap via "--noswap".
     (Closes: #383058)
+  * Preserve debootstrap error output in xt-install-image.
+    (Closes: #383037)
 
  -- Steve Kemp <skx@debian.org>  Mon, 14 Aug 2006 22:34:59 +0000