diff --git a/debian/changelog b/debian/changelog
index a8732f48..642c99ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+livecd-rootfs (2.317) wily; urgency=medium
+
+  [ Sebastien Bacher ]
+  * live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot:
+    - create other needed directories
+  * live-build/ubuntu-desktop-next/includes.chroot:
+    - copy ubuntu-core's include for /etc/hosts and resolv.conf config
+  * live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early:
+    - copy touch hacks to create needed userdirs (lightdm & usermetrics),
+      the users are added by the script and not the usual postinst so their
+      uderdirs are not created as they should
+  * live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary:
+    - don't remove the copyright and manpages on desktop
+
+  [ Oliver Grawert ]
+  * allow install of "multi" click packages in 60-install-click.chroot on
+    ubuntu-touch
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 19 Jun 2015 10:52:07 +0200
+
 livecd-rootfs (2.316) wily; urgency=medium
 
   * live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot:
diff --git a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
index cce63559..4f7fc896 100755
--- a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
+++ b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
@@ -277,6 +277,18 @@ if [ -n "$ERRCNT" ]; then
         exit 1
 fi
 
+# Create some missing directories
+mkdir -p /var/lib/lightdm
+chown lightdm:lightdm /var/lib/lightdm
+chmod 750 /var/lib/lightdm
+
+mkdir -p /var/lib/usermetrics
+chown usermetrics:usermetrics /var/lib/usermetrics
+chmod 750 /var/lib/usermetrics
+
+echo "adjusting ownership of /var/log" >&2
+chown root:syslog /var/log
+ls -ln /var | grep log >&2
 
 # Record the current state for later comparison
 for file in /etc/passwd /etc/shadow /etc/group /etc/gshadow; do
diff --git a/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary b/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary
index e870e239..0fe6d487 100644
--- a/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary
+++ b/live-build/ubuntu-desktop-next/hooks/10-remove-documentation.binary
@@ -1,19 +1,5 @@
 #!/bin/sh -x
 
-echo "I: Remove unneeded files from /usr/share/doc "
-find binary/boot/filesystem.dir/usr/share/doc -depth -type f ! -name copyright|xargs rm -f || true
-find binary/boot/filesystem.dir/usr/share/doc -empty|xargs rmdir || true
-find binary/boot/filesystem.dir/usr/share/doc -type f -exec gzip -9 {} \;
-
-echo "I: Remove man/info pages"
-rm -rf binary/boot/filesystem.dir/usr/share/man \
-       binary/boot/filesystem.dir/usr/share/groff \
-       binary/boot/filesystem.dir/usr/share/info \
-       binary/boot/filesystem.dir/usr/share/lintian \
-       binary/boot/filesystem.dir/usr/share/linda \
-       binary/boot/filesystem.dir/var/cache/man
-    
-
 echo "I: Removing /var/lib/apt/lists/*"
 find binary/boot/filesystem.dir/var/lib/apt/lists/ -type f | xargs rm -f
 
diff --git a/live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot b/live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot
index 22c6e096..e15ef5df 100755
--- a/live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot
+++ b/live-build/ubuntu-desktop-next/hooks/20-extra-files.chroot
@@ -2,5 +2,7 @@
 
 set -e
 
-echo "writable mounts directory" >&2
+echo "create needed directories" >&2
+mkdir -p /lib/modules
+mkdir -p /lib/firmware
 mkdir -p /writable
diff --git a/live-build/ubuntu-desktop-next/includes.chroot/etc/hosts b/live-build/ubuntu-desktop-next/includes.chroot/etc/hosts
new file mode 100644
index 00000000..81684340
--- /dev/null
+++ b/live-build/ubuntu-desktop-next/includes.chroot/etc/hosts
@@ -0,0 +1,9 @@
+127.0.0.1	localhost.localdomain	localhost
+::1		localhost6.localdomain6	localhost6
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
diff --git a/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf b/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf
new file mode 120000
index 00000000..0141cbbf
--- /dev/null
+++ b/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf
@@ -0,0 +1 @@
+../run/resolvconf/resolv.conf
\ No newline at end of file
diff --git a/live-build/ubuntu-touch/hooks/60-install-click.chroot b/live-build/ubuntu-touch/hooks/60-install-click.chroot
index fa4401ec..81468447 100755
--- a/live-build/ubuntu-touch/hooks/60-install-click.chroot
+++ b/live-build/ubuntu-touch/hooks/60-install-click.chroot
@@ -25,7 +25,7 @@ CLICKARCH=$(dpkg --print-architecture)
 wget --no-verbose -O "$tmpdir/click_list" "$click_list"
 for package in $(cat "$tmpdir/click_list")
 do
-    if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click"; then
+    if echo $package | egrep -q "_$CLICKARCH.click|_all.click|_unknown.click|_multi.click"; then
         echo "Setting up $package"
         wget --no-verbose -O "$tmpdir/$package" "$click_uri/$package"
 	# FIXME: first attempt, a hard-coded list of the packages that go to