diff --git a/debian/changelog b/debian/changelog
index 815cb896..1089280b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.4) UNRELEASED; urgency=low
+
+  * Remove old config directory before creating a new configuration.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 15 Jun 2011 10:14:46 +0100
+
 livecd-rootfs (2.3) oneiric; urgency=low
 
   * Set pipefail (bash-specific) in auto/build so that we fail immediately
diff --git a/live-build/auto/config b/live-build/auto/config
index 83a674c4..82c02459 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1,6 +1,8 @@
 #! /bin/sh
 set -e
 
+rm -rf config
+
 if [ -z "$MIRROR" ]; then
 	case $(hostname --fqdn) in
 		bld-*.mmjgroup.com)	;;