diff --git a/debian/changelog b/debian/changelog
index 87fdffe0..e6d3fe49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.361) xenial; urgency=medium
+
+  * live-build/ubuntu-core/hooks/01-setup_user.chroot:
+    make sure the default group is still created when adding the default user
+    to adm and sudo groups.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 08 Dec 2015 16:36:34 +0100
+
 livecd-rootfs (2.360) xenial; urgency=medium
 
   [ Michael Vogt ]
diff --git a/live-build/ubuntu-core/hooks/01-setup_user.chroot b/live-build/ubuntu-core/hooks/01-setup_user.chroot
index 04586c58..bc470c09 100755
--- a/live-build/ubuntu-core/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-core/hooks/01-setup_user.chroot
@@ -6,7 +6,11 @@ USER=ubuntu
 UGID=1000
 
 echo "I: creating default user $USER"
-adduser --ingroup adm --ingroup sudo --gecos $USER --disabled-login $USER --uid $UGID
+adduser --gecos $USER --disabled-login $USER --uid $UGID
+
+for extragroup in adm sudo; do
+    adduser $USER $extragroup
+done
 
 chown -R $UGID:$UGID /home/$USER