diff --git a/debian/changelog b/debian/changelog
index 43b327c1..951884c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (1.163) natty; urgency=low
+
+  * make sure preinstalled images do not have the build machine set as
+    hostname before oem-config runs (LP: #605972)
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 10 Mar 2011 14:48:43 +0100
+
 livecd-rootfs (1.162) natty; urgency=low
 
   * the name of the flavour needs to be ubuntu-headless, not just headless
diff --git a/livecd.sh b/livecd.sh
index 72d210e4..17801190 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -100,6 +100,9 @@ livefs_ext2()
   dd if=/dev/zero of=${MOUNTPOINT}/SWAP.swap bs=1048576 count=512
   mkswap ${MOUNTPOINT}/SWAP.swap
 
+  # make sure we dont have the buildd name set as hostname (LP: #605972)
+  echo "localhost" >${MOUNTPOINT}/etc/hostname
+
   # clean up
   umount ${MOUNTPOINT}
   rm -rf ${MOUNTPOINT}