diff --git a/Makefile b/Makefile
index f0655ec2..aba0b81c 100755
--- a/Makefile
+++ b/Makefile
@@ -139,14 +139,14 @@ $(BDIR)/DATE:
 $(DB_DIR): $(LATEST_DB)
 	@rm -rf $(DB_DIR)
 	@dpkg -x $(LATEST_DB) $(DB_DIR)
-# Make sure unstable/sid points to testing/etch, as there is no build
+# Make sure unstable/sid points to testing/lenny, as there is no build
 # rule for unstable/sid.
 unstable-map:
 	$(Q)if [ ! -d $(BASEDIR)/data/sid ] ; then \
-		ln -s etch $(BASEDIR)/data/sid ; \
+		ln -s lenny $(BASEDIR)/data/sid ; \
 	fi
 	$(Q)if [ ! -d $(BASEDIR)/tools/boot/sid ] ; then \
-		ln -s etch $(BASEDIR)/tools/boot/sid ; \
+		ln -s lenny $(BASEDIR)/tools/boot/sid ; \
 	fi
 
 #################
diff --git a/data/sid b/data/sid
index 190cf351..fb5b6534 120000
--- a/data/sid
+++ b/data/sid
@@ -1 +1 @@
-etch
\ No newline at end of file
+lenny
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index dcffc20c..a8f19ce9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,9 @@ debian-cd (3.0.3) UNRELEASED; urgency=low
     currently not used in Debian Installer.
   * Disable sparc32 for Lenny images as it is no longer supported.
 
+  [ Steve McIntyre ]
+  * Update unstable-map: in the Makefile - use lenny rather than etch
+
  -- Frans Pop <fjp@debian.org>  Wed, 18 Jul 2007 01:05:42 +0200
 
 debian-cd (3.0.2) unstable; urgency=high