diff --git a/Makefile b/Makefile
index b6b4bfbe..9c24a7ca 100755
--- a/Makefile
+++ b/Makefile
@@ -139,6 +139,10 @@ $(BDIR)/DATE:
 $(DB_DIR): $(LATEST_DB)
 	@rm -rf $(DB_DIR)
 	@dpkg -x $(LATEST_DB) $(DB_DIR)
+	if [ ! -e $(DEBOOTSTRAP_DIR) ] ; then \
+		ln -sf share $(DB_DIR)/usr/lib ; \
+	fi
+
 # Make sure unstable/sid points to testing/lenny, as there is no build
 # rule for unstable/sid.
 unstable-map:
@@ -292,7 +296,8 @@ $(BDIR)/rawlist:
 				            $(TDIR)/debootstrap.tmp \
 				            file:$(MIRROR) \
 			                $(DEBOOTSTRAP_SCRIPT) 2>/dev/null \
-				    | tr ' ' '\n' >>$(BDIR)/rawlist; \
+				    | tr ' ' '\n' > $(BDIR)/debootstrap-list; \
+				cat $(BDIR)/debootstrap-list >>$(BDIR)/rawlist; \
 				rm -rf $(TDIR)/debootstrap.tmp; \
 			done; \
 		fi; \
diff --git a/debian/changelog b/debian/changelog
index b6dcfed3..526d8b96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,7 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
     the win32-loader files into place if they don't exist.
   * Remove Depends: on sysutils. Closes: #437497 (again)
 
-  [ Jérémy Bobbio ]
+  [ Jérémy Bobbi]
   * README.html: Integrate a new look for README.html done by Kalle Söderman.
     Huge thanks to him!
   * README: Improve the wording when building a netinst or business card by
@@ -39,7 +39,14 @@ debian-cd (3.0.4) UNRELEASED; urgency=low
   * Include dmraid deb. Closes: #443991
   * Add acpi-support-base to generate_di+k_list.
 
- -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 03 Nov 2007 10:51:26 -0200
+  [ Steve McIntyre ]
+  * Newer versions of debootstrap have moved the scripts from /usr/lib to
+    /usr/share. Add a sym-link to cope - let's keep compatible with etch
+    as much as possible. Also, log what debootstrap told us (in
+    debootstrap-list) rather than just including the results directly in
+    rawlist.
+	
+ -- Steve McIntyre <93sam@debian.org>  Mon, 19 Nov 2007 23:40:32 +0000
 
 debian-cd (3.0.3) unstable; urgency=low