diff --git a/debian/changelog b/debian/changelog
index 6dfb44a9..1abc9207 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-livecd-rootfs (2.420) UNRELEASED; urgency=medium
+livecd-rootfs (2.420ubuntu1) UNRELEASED; urgency=medium
 
+  [ Łukasz 'sil2100' Zemczak ]
   * Remove the ubuntu-pd project from the scripts
   * Add instead an ubuntu-touch-custom project for custom re-builds of
     ubuntu-touch 
 
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 06 Jul 2016 12:57:44 +0200
+  [ Louis Zuckerman ]
+  * Fixes for vagrant box builder in ubuntu-cpc LP: #1565985
+  * Remove extra packages added on 24 Jun 2016 except virtualbox-guest stuff
+  * Add cloud-init config to manage /etc/hosts for localhost
+
+ -- Louis Zuckerman <me@louiszuckerman.com>  Wed, 06 Jul 2016 13:51:20 +0000
 
 livecd-rootfs (2.419) yakkety; urgency=medium
 
diff --git a/live-build/ubuntu-cpc/hooks/042-vagrant.binary b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
index ba92bb42..c98958e9 100755
--- a/live-build/ubuntu-cpc/hooks/042-vagrant.binary
+++ b/live-build/ubuntu-cpc/hooks/042-vagrant.binary
@@ -37,21 +37,14 @@ trap "rm -rf ${box_d} ${seed_d} ${mount_d}" EXIT
 
 pkgs=(virtualbox-guest-dkms
       virtualbox-guest-utils
-      linux-headers-generic
-      nfs-common
-      python-apport
-      puppet
-      chef
-      byobu
-      juju
-      ruby
-      libnss-myhostname
 )
 # Package list from: http://bazaar.launchpad.net/~ubuntu-on-ec2/vmbuilder/jenkins_kvm/view/head:/templates/img-vagrant.tmpl#L249
 
 create_derivative "disk" "vagrant" #sets ${derivative_img}
 mount_disk_image ${derivative_img} ${mount_d}
+env DEBIAN_FRONTEND=noninteractive chroot ${mount_d} apt-get update
 env DEBIAN_FRONTEND=noninteractive chroot ${mount_d} apt-get install --no-install-recommends -y ${pkgs[@]}
+env DEBIAN_FRONTEND=noninteractive chroot ${mount_d} apt-get clean
 umount_disk_image ${mount_d}
 
 # Used to identify bits
@@ -86,6 +79,7 @@ cat > ${seed_d}/user-data <<END
 password: ${ubuntu_user_pass}
 chpasswd: { expire: False }
 ssh_pwauth: True
+manage_etc_hosts: localhost
 END
 
 # Create the fake meta-data