diff --git a/debian/changelog b/debian/changelog
index eeed209d..39bc4e15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.334) UNRELEASED; urgency=medium
+
+  * add dnsmasq user to snappy builds, needed by ubuntu-fan
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Tue, 28 Jul 2015 10:48:13 +0200
+
 livecd-rootfs (2.333) wily; urgency=medium
 
   * lp:~mvo/livecd-rootfs/snappy-add-fw_env.config:
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 71f5bbd4..ebd33bbd 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
@@ -44,6 +44,7 @@ systemd-resolve:x:105:110:systemd Resolver,,,:/run/systemd/resolve:/bin/false
 systemd-bus-proxy:x:106:111:systemd Bus Proxy,,,:/run/systemd:/bin/false
 docker:x:107:113::/nonexistent:/bin/false
 syslog:x:108:114::/home/syslog:/bin/false
+dnsmasq:x:109:65534:dnsmasq,,,:/var/lib/misc:/bin/false
 EOF
 else
     echo "/etc/passwd post-debootstrap hash doesn't match record" >&2
@@ -83,6 +84,7 @@ systemd-resolve:*:16413:0:99999:7:::
 systemd-bus-proxy:*:16413:0:99999:7:::
 docker:*:16413:0:99999:7:::
 syslog:*:16521:0:99999:7:::
+dnsmasq:*:16644:0:99999:7:::
 EOF
 else
     echo "/etc/shadow post-debootstrap hash doesn't match record" >&2