diff --git a/debootstrap/debootstrap b/debootstrap/debootstrap
index 84e18dd..a0dacf3 100755
--- a/debootstrap/debootstrap
+++ b/debootstrap/debootstrap
@@ -1,13 +1,11 @@
 #!/bin/sh -e
 
-VERSION='1.0.10'
+VERSION='1.0.10lenny1'
 
 unset TMP TEMP TMPDIR || true
 
 ###########################################################################
 
-DEBOOTSTRAP_DIR=debootstrap
-
 if [ "$DEBOOTSTRAP_DIR" = "" ]; then
 	if [ -x /debootstrap/debootstrap ]; then
 		DEBOOTSTRAP_DIR=/debootstrap
diff --git a/debootstrap/devices.tar.gz b/debootstrap/devices.tar.gz
index d59fe41..2556110 100644
Binary files a/debootstrap/devices.tar.gz and b/debootstrap/devices.tar.gz differ
diff --git a/debootstrap/functions b/debootstrap/functions
index 5c38ec6..b9180ba 100644
--- a/debootstrap/functions
+++ b/debootstrap/functions
@@ -862,7 +862,7 @@ setup_devices () {
 		setup_devices_hurd ;;
 	    *)
 		if [ -e "$DEVICES_TARGZ" ]; then
-			zcat "$DEVICES_TARGZ" | (cd "$TARGET"; tar -xf -)
+			(cd "$TARGET"; zcat "$DEVICES_TARGZ" | tar -xf -)
 		else
 			if [ -e /dev/.devfsd ] ; then
 				in_target mount -t devfs devfs /dev
diff --git a/debootstrap/scripts/etch b/debootstrap/scripts/lenny
similarity index 100%
rename from debootstrap/scripts/etch
rename to debootstrap/scripts/lenny