diff --git a/debian/changelog b/debian/changelog
index 13390670..e2328b5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (2.340) wily; urgency=medium
+
+  [ Michael Vogt ]
+  * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:
+    - cleanup further after moving the kernel out of the rootfs
+      (LP: #1468469)
+
+  [ Oliver Grawert ]
+  * systemd-journal-remote was dropped from /etc/group and /etc/gshadow,
+    update the files and md5sums in the passwd checks of ubuntu-core
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 03 Sep 2015 14:20:39 +0200
+
 livecd-rootfs (2.339) wily; urgency=medium
 
   * revert the apparmor-super-noise change, issue is found
diff --git a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
index ebd33bbd..afdf16c0 100755
--- a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
+++ b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
@@ -3,10 +3,10 @@
 ERRCNT=""
 
 # Known good post-debootstrap values
-passwd_bootstrap="af34a24499223f08ab713138bec7ff54"
+passwd_bootstrap="c0d388ca626db569e13fdee7ad41c9bf"
 shadow_bootstrap="1fd73103260cbe5a13a4a38320de4129"
-group_bootstrap="9edf30f181a6fd1d860cc7f4a71aa640"
-gshadow_bootstrap="b9db51ef767ab98db963db69844635dd"
+group_bootstrap="d48601572a61e8db69854381392cd2f9"
+gshadow_bootstrap="1dbb70f91959296a5a4c9841e21961ed"
 
 # Current post-debootstrap values
 passwd_hash=$(set -- $(md5sum /etc/passwd) && echo $1)
@@ -142,7 +142,6 @@ messagebus:x:103:
 snappypkg:x:104:
 ssh:x:105:
 systemd-journal:x:106:
-systemd-journal-remote:x:107:
 systemd-timesync:x:108:
 systemd-network:x:109:
 systemd-resolve:x:110:
@@ -207,7 +206,6 @@ messagebus:!::
 snappypkg:!::
 ssh:!::
 systemd-journal:!::
-systemd-journal-remote:!::
 systemd-timesync:!::
 systemd-network:!::
 systemd-resolve:!::
diff --git a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
index 78a09110..a94f0cf1 100644
--- a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
+++ b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
@@ -82,4 +82,9 @@ rm -rf $TMPDIR
  rm -f vmlinu?
  rm -rf lib/modules
  rm -rf lib/firmware
+ # lp: #1468469
+ rm -rf boot/config-*
+ rm -rf usr/share/doc/linux-image*
+ rm -rf var/lib/initramfs-tools/*
+ rm -rf lib/modprobe.d/blacklist_linux_*.conf
 )