diff --git a/releases/2008.0/ChangeLog b/releases/2008.0/ChangeLog
index 636d7b04..f0e70b53 100644
--- a/releases/2008.0/ChangeLog
+++ b/releases/2008.0/ChangeLog
@@ -2,6 +2,8 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  28 Feb 2008; Andrew Gaffney <agaffney@gentoo.org> scripts/livecd.sh:
+  Add code to livecd.sh to make sure /home/gentoo is owned by the 'gentoo' user
 
   28 Feb 2008; Brent Baude <ranger@gentoo.org>
   specs/ppc/ppc64/livecd-stage2.spec
diff --git a/releases/2008.0/scripts/livecd.sh b/releases/2008.0/scripts/livecd.sh
index 4b142d5c..b313cadd 100644
--- a/releases/2008.0/scripts/livecd.sh
+++ b/releases/2008.0/scripts/livecd.sh
@@ -15,3 +15,11 @@ case `uname -m` in
 	;;
 esac
 
+# This is necessary because /home/gentoo in the squashfs ends up getting owned
+# by whoever the owner of the overlay files were on the build box. This causes
+# weird stuff to happen like X failing to start because it doesn't have the
+# ability to write the .Xauthority file
+if [[ -d /home/gentoo ]]
+then
+	chown -R gentoo:users /home/gentoo
+fi