diff --git a/debian/changelog b/debian/changelog
index c1fa21b4..ffcb85d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.311) UNRELEASED; urgency=medium
+
+  * Updates users and groups for desktop next
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 08 Jun 2015 15:31:03 +0200
+
 livecd-rootfs (2.310) wily; urgency=medium
 
   * Don't add a docker group to desktop next
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 89210036..cce63559 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
@@ -40,6 +40,19 @@ systemd-network:x:101:105:systemd Network Management,,,:/run/systemd/netif:/bin/
 systemd-resolve:x:102:106:systemd Resolver,,,:/run/systemd/resolve:/bin/false
 systemd-bus-proxy:x:103:107:systemd Bus Proxy,,,:/run/systemd:/bin/false
 syslog:x:104:110::/home/syslog:/bin/false
+usermetrics:x:105:111:User Metrics:/var/lib/usermetrics:/bin/false
+messagebus:x:106:112::/var/run/dbus:/bin/false
+uuidd:x:107:113::/run/uuidd:/bin/false
+clickpkg:x:108:114::/nonexistent:/bin/false
+avahi:x:109:115:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false
+dnsmasq:x:110:65534:dnsmasq,,,:/var/lib/misc:/bin/false
+pulse:x:111:116:PulseAudio daemon,,,:/var/run/pulse:/bin/false
+whoopsie:x:112:118::/nonexistent:/bin/false
+sshd:x:113:65534::/var/run/sshd:/usr/sbin/nologin
+rtkit:x:114:123:RealtimeKit,,,:/proc:/bin/false
+usbmux:x:115:46:usbmux daemon,,,:/var/lib/usbmux:/bin/false
+colord:x:116:124:colord colour management daemon,,,:/var/lib/colord:/bin/false
+lightdm:x:117:126:Light Display Manager:/var/lib/lightdm:/bin/false
 EOF
 else
     echo "/etc/passwd post-debootstrap hash doesn't match record" >&2
@@ -75,6 +88,19 @@ systemd-network:*:16591:0:99999:7:::
 systemd-resolve:*:16591:0:99999:7:::
 systemd-bus-proxy:*:16591:0:99999:7:::
 syslog:*:16591:0:99999:7:::
+usermetrics:*:16594:0:99999:7:::
+messagebus:*:16594:0:99999:7:::
+uuidd:*:16594:0:99999:7:::
+clickpkg:*:16594:0:99999:7:::
+avahi:*:16594:0:99999:7:::
+dnsmasq:*:16594:0:99999:7:::
+pulse:*:16594:0:99999:7:::
+whoopsie:*:16594:0:99999:7:::
+sshd:*:16594:0:99999:7:::
+rtkit:*:16594:0:99999:7:::
+usbmux:*:16594:0:99999:7:::
+colord:*:16594:0:99999:7:::
+lightdm:*:16594:0:99999:7:::
 EOF
 else
     echo "/etc/shadow post-debootstrap hash doesn't match record" >&2
@@ -107,8 +133,8 @@ voice:x:22:
 cdrom:x:24:
 floppy:x:25:
 tape:x:26:
-sudo:x:27:
-audio:x:29:
+sudo:x:27:ubuntu
+audio:x:29:pulse
 dip:x:30:
 www-data:x:33:
 backup:x:34:
@@ -136,6 +162,23 @@ systemd-bus-proxy:x:107:
 netdev:x:108:
 crontab:x:109:
 syslog:x:110:
+usermetrics:x:111:
+messagebus:x:112:
+uuidd:x:113:
+clickpkg:x:114:
+avahi:x:115:
+pulse:x:116:
+pulse-access:x:117:
+whoopsie:x:118:
+bluetooth:x:119:
+mlocate:x:120:
+ssh:x:121:
+scanner:x:122:
+rtkit:x:123:
+colord:x:124:
+autopilot:x:125:
+lightdm:x:126:
+nopasswdlogin:x:127:
 EOF
 else
     echo "/etc/group post-debootstrap hash doesn't match record" >&2
@@ -168,8 +211,8 @@ voice:*::
 cdrom:*::
 floppy:*::
 tape:*::
-sudo:*::
-audio:*::
+sudo:*::ubuntu
+audio:*::pulse
 dip:*::
 www-data:*::
 backup:*::
@@ -197,6 +240,23 @@ systemd-bus-proxy:!::
 netdev:!::
 crontab:!::
 syslog:!::
+usermetrics:!::
+messagebus:!::
+uuidd:!::
+clickpkg:!::
+avahi:!::
+pulse:!::
+pulse-access:!::
+whoopsie:!::
+bluetooth:!::
+mlocate:!::
+ssh:!::
+scanner:!::
+rtkit:!::
+colord:!::
+autopilot:!::
+lightdm:!::
+nopasswdlogin:!::
 EOF
 else
     echo "/etc/gshadow post-debootstrap hash doesn't match record" >&2