diff --git a/debian/changelog b/debian/changelog
index dafabbc1..0d298cb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ livecd-rootfs (2.317) UNRELEASED; urgency=medium
 
   * 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
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 17 Jun 2015 20:24:56 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 19 Jun 2015 10:26:41 +0200
 
 livecd-rootfs (2.316) wily; urgency=medium
 
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