diff --git a/releases/2008.0/ChangeLog b/releases/2008.0/ChangeLog
index 1ef790c6..69acb7f2 100644
--- a/releases/2008.0/ChangeLog
+++ b/releases/2008.0/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  11 Jun 2008; Andrew Gaffney <agaffney@gentoo.org> scripts/livecd.sh:
+  Clear out /boot in the squashfs
+  Copy System.map instead of moving from /usr/livecd
+
   06 Jun 2008; Chris Gianelloni <wolf31o2@gentoo.org> scripts/livecd.sh:
   Don't run the kernel copying code unless we're booting from CD.
 
diff --git a/releases/2008.0/scripts/livecd.sh b/releases/2008.0/scripts/livecd.sh
index bedd10ee..28a32955 100644
--- a/releases/2008.0/scripts/livecd.sh
+++ b/releases/2008.0/scripts/livecd.sh
@@ -45,6 +45,7 @@ echo "tmpfs	/boot		tmpfs	defaults	0 0" >> /etc/fstab
 # pull /boot from the CD
 cd /boot && ls -1 | grep -v boot > /usr/livecd/bootfiles.txt
 mv -f System.map* /usr/livecd
+rm -rf /boot/*
 cat << EOF >> /etc/conf.d/local.start
 if [ -n "$(ls /mnt/cdrom)" ]
 then
@@ -55,7 +56,7 @@ then
 	kernel=`grep kernel /usr/livecd/bootfiles.txt | head -n 1`
 	cp -f /mnt/cdrom/*/${INITRAMFS} /boot/${initramfs}
 	cp -f /mnt/cdrom/*/${KERNEL} /boot/${kernel}
-	mv -f /usr/livecd/System.map* /boot
+	cp -f /usr/livecd/System.map* /boot
 fi
 EOF