diff --git a/debian/changelog b/debian/changelog
index 569e3e2f..caf7f098 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.320) wily; urgency=medium
+
+  * snappy/desktop-next:
+    - add snappypkg user and remove clickpkg user
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 30 Jun 2015 14:09:52 +0200
+
 livecd-rootfs (2.319) wily; urgency=medium
 
   * copy set locale hook from core to desktop-next
diff --git a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
index 00ff4e3f..71f5bbd4 100755
--- a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
+++ b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
@@ -36,7 +36,7 @@ irc:x:39:39:ircd:/var/run/ircd:/usr/sbin/nologin
 gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
 nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
 messagebus:x:100:103::/var/run/dbus:/bin/false
-clickpkg:x:101:104::/nonexistent:/bin/false
+snappypkg:x:101:104::/nonexistent:/bin/false
 sshd:x:102:65534::/var/run/sshd:/usr/sbin/nologin
 systemd-timesync:x:103:108:systemd Time Synchronization,,,:/run/systemd:/bin/false
 systemd-network:x:104:109:systemd Network Management,,,:/run/systemd/netif:/bin/false
@@ -75,7 +75,7 @@ irc:*:16329:0:99999:7:::
 gnats:*:16329:0:99999:7:::
 nobody:*:16329:0:99999:7:::
 messagebus:*:16413:0:99999:7:::
-clickpkg:*:16413:0:99999:7:::
+snappypkg:*:16413:0:99999:7:::
 sshd:*:16413:0:99999:7:::
 systemd-timesync:*:16413:0:99999:7:::
 systemd-network:*:16413:0:99999:7:::
@@ -137,7 +137,7 @@ nogroup:x:65534:
 netdev:x:101:
 crontab:x:102:
 messagebus:x:103:
-clickpkg:x:104:
+snappypkg:x:104:
 ssh:x:105:
 systemd-journal:x:106:
 systemd-journal-remote:x:107:
@@ -202,7 +202,7 @@ nogroup:*::
 netdev:!::
 crontab:!::
 messagebus:!::
-clickpkg:!::
+snappypkg:!::
 ssh:!::
 systemd-journal:!::
 systemd-journal-remote:!::
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 4f7fc896..7854c554 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
@@ -43,7 +43,7 @@ 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
+snappypkg: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
@@ -91,7 +91,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:::
+snappypkg:*:16594:0:99999:7:::
 avahi:*:16594:0:99999:7:::
 dnsmasq:*:16594:0:99999:7:::
 pulse:*:16594:0:99999:7:::
@@ -165,7 +165,7 @@ syslog:x:110:
 usermetrics:x:111:
 messagebus:x:112:
 uuidd:x:113:
-clickpkg:x:114:
+snappypkg:x:114:
 avahi:x:115:
 pulse:x:116:
 pulse-access:x:117:
@@ -243,7 +243,7 @@ syslog:!::
 usermetrics:!::
 messagebus:!::
 uuidd:!::
-clickpkg:!::
+snappypkg:!::
 avahi:!::
 pulse:!::
 pulse-access:!::