diff --git a/debian/changelog b/debian/changelog
index caf7f098..1993c99b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,12 @@
-livecd-rootfs (2.320) wily; urgency=medium
+livecd-rootfs (2.320) UNRELEASED; urgency=medium
 
+  * Copied some touch tweaks (n-m config and user groups) to desktop-next
+
+  [ Michael Vogt ]
   * snappy/desktop-next:
     - add snappypkg user and remove clickpkg user
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 30 Jun 2015 14:09:52 +0200
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 30 Jun 2015 18:08:10 +0200
 
 livecd-rootfs (2.319) wily; urgency=medium
 
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 967c6a1b..84e07272 100755
--- a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
@@ -8,6 +8,11 @@ UGID=1000
 echo "I: creating default user $USER"
 adduser --gecos $USER --disabled-login $USER --uid $UGID
 
+mkdir -p /home/$USER/Music
+mkdir -p /home/$USER/Pictures
+mkdir -p /home/$USER/Videos
+mkdir -p /home/$USER/Downloads
+mkdir -p /home/$USER/Documents
 chown -R $UGID:$UGID /home/$USER
 
 # Enable libnss-extrusers
diff --git a/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot
index 2e48e233..232fab3e 100755
--- a/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot
+++ b/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot
@@ -2,7 +2,7 @@
 
 USER=ubuntu
 
-DEFGROUPS="sudo"
+DEFGROUPS="sudo,adm,dialout,cdrom,plugdev,audio,dip,video"
 
 echo "I: add $USER to ($DEFGROUPS) group(s)"
 usermod -a -G ${DEFGROUPS} ${USER}
diff --git a/live-build/ubuntu-desktop-next/hooks/45-add-sudo-group-nm.chroot b/live-build/ubuntu-desktop-next/hooks/45-add-sudo-group-nm.chroot
new file mode 100755
index 00000000..66d45396
--- /dev/null
+++ b/live-build/ubuntu-desktop-next/hooks/45-add-sudo-group-nm.chroot
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "Adding admin group policy to NM system service"
+
+sed -i 's/<policy user="root">/<policy group="sudo">\n\t\t\t\t<allow send_destination="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager.SecretAgent"\/>\n\t\t<\/policy>\n\t\t<policy user="root">/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+
+mkdir -p /etc/polkit-1/localauthority/50-local.d
+cat > /etc/polkit-1/localauthority/50-local.d/org.freedesktop.NetworkManager.pkla << EOF
+[indicator-network-service]
+Identity=unix-group:sudo
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+EOF