diff --git a/debian/changelog b/debian/changelog
index e339b53f..c073782b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.343) UNRELEASED; urgency=medium
+
+  * add empty "extrausers" equivalents for subuid and subgid files, else
+    adduser falls over in interactive mode when trying to write to them.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Wed, 09 Sep 2015 13:28:10 +0200
+
 livecd-rootfs (2.342) wily; urgency=medium
 
   * ubuntu-touch, ubuntu-desktop-next: drop systemd-journal-remote from group
diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot
index 967c6a1b..e9f3e2b1 100755
--- a/live-build/ubuntu-core/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot
@@ -30,6 +30,8 @@ sed -i "/^$USER/d" /etc/group
 sed -i "/^$USER/d" /etc/passwd
 sed -i "/^$USER/d" /etc/shadow
 sed -i "/^$USER/d" /etc/gshadow
+touch /var/lib/extrausers/subuid
+touch /var/lib/extrausers/subgid
 
 # needs to run *after* the user was moved out to /var/lib/extrausers
 echo "I: set user $USER password to $USER"
diff --git a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
index 84e07272..26564c3c 100755
--- a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
@@ -35,6 +35,8 @@ sed -i "/^$USER/d" /etc/group
 sed -i "/^$USER/d" /etc/passwd
 sed -i "/^$USER/d" /etc/shadow
 sed -i "/^$USER/d" /etc/gshadow
+touch /var/lib/extrausers/subuid
+touch /var/lib/extrausers/subgid
 
 # needs to run *after* the user was moved out to /var/lib/extrausers
 echo "I: set user $USER password to $USER"
diff --git a/live-build/ubuntu-touch/hooks/01-setup_user.chroot b/live-build/ubuntu-touch/hooks/01-setup_user.chroot
index 966f5d3e..1be0534d 100755
--- a/live-build/ubuntu-touch/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-touch/hooks/01-setup_user.chroot
@@ -32,6 +32,8 @@ sed -i "/^$USER/d" /etc/group
 sed -i "/^$USER/d" /etc/passwd
 sed -i "/^$USER/d" /etc/shadow
 sed -i "/^$USER/d" /etc/gshadow
+touch /var/lib/extrausers/subuid
+touch /var/lib/extrausers/subgid
 
 # Prevent the system user from being presented in the greeter by bumping MIN_UID
 sed -i 's/^\(UID_MIN\s\+\).*/\11002/g' /etc/login.defs