diff --git a/CONF.sh b/CONF.sh
index 24a1ec41..46d51643 100644
--- a/CONF.sh
+++ b/CONF.sh
@@ -54,8 +54,8 @@ unset OMIT_DOC_TOOLS     || true
 # Where I am (hoping I'm in the debian-cd dir)
 export BASEDIR=`pwd`
 
-# Building etch cd set ...
-export CODENAME=etch
+# Building lenny cd set ...
+export CODENAME=lenny
 
 # By default use Debian installer packages from $CODENAME
 if [ -z "$DI_CODENAME" ]; then
@@ -102,17 +102,17 @@ fi
 #	      images, however. Also, if you are using an NFS partition for
 #	      some part of this, you must use this option.
 # Paths to the mirrors
-export MIRROR=/mirror/debian
+export MIRROR=/srv/mirror/debian
 
 # Path of the temporary directory
-export TDIR=/mirror/tmp
+export TDIR=/srv/mirror/tmp
 
 # Path where the images will be written
-export OUT=/mirror/debian-cd-test
+export OUT=/srv/mirror/debian-cd-test
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.
-export APTTMP=/mirror/tmp/apt
+export APTTMP=/srv/mirror/tmp/apt
 
 # Do I want to have NONFREE merged in the CD set
 # export NONFREE=1
diff --git a/debian/CONF.sh b/debian/CONF.sh
index 24a1ec41..46d51643 100644
--- a/debian/CONF.sh
+++ b/debian/CONF.sh
@@ -54,8 +54,8 @@ unset OMIT_DOC_TOOLS     || true
 # Where I am (hoping I'm in the debian-cd dir)
 export BASEDIR=`pwd`
 
-# Building etch cd set ...
-export CODENAME=etch
+# Building lenny cd set ...
+export CODENAME=lenny
 
 # By default use Debian installer packages from $CODENAME
 if [ -z "$DI_CODENAME" ]; then
@@ -102,17 +102,17 @@ fi
 #	      images, however. Also, if you are using an NFS partition for
 #	      some part of this, you must use this option.
 # Paths to the mirrors
-export MIRROR=/mirror/debian
+export MIRROR=/srv/mirror/debian
 
 # Path of the temporary directory
-export TDIR=/mirror/tmp
+export TDIR=/srv/mirror/tmp
 
 # Path where the images will be written
-export OUT=/mirror/debian-cd-test
+export OUT=/srv/mirror/debian-cd-test
 
 # Where we keep the temporary apt stuff.
 # This cannot reside on an NFS mount.
-export APTTMP=/mirror/tmp/apt
+export APTTMP=/srv/mirror/tmp/apt
 
 # Do I want to have NONFREE merged in the CD set
 # export NONFREE=1
diff --git a/debian/changelog b/debian/changelog
index eadd8dce..9cf160b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,8 @@ debian-cd (3.0.5) UNRELEASED; urgency=low
     D-I images.
   * Add easy-build.sh, a wrapper script for building images that takes care
     of a lot of the gotchas that can make debian-cd hard to use.
+  * CONF.sh: change default CODENAME to lenny; change example paths to mirror
+    to /srv/mirror.
 
  -- Frans Pop <fjp@debian.org>  Tue, 14 Oct 2008 10:01:20 +0200