diff --git a/debian/changelog b/debian/changelog
index e9201fbc..aba0b12c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+livecd-rootfs (2.269) UNRELEASED; urgency=low
+
+  * live-build/auto/{build,config}:
+    - create device-azure.tar.gz during the build that includes the
+      packages for the azure cloud
+  * live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary:
+    - display helpful message to use snappy when a user tries to use
+      apt-get on a snappy system
+  * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:
+    - do the device-azure.tar.gz extraction here
+  * live-build/ubuntu-core/hooks/12-add-docker-user.chroot:
+    - ensure docker group is used
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 24 Nov 2014 08:38:15 +0100
+
 livecd-rootfs (2.268) vivid; urgency=low
 
   * live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary:
diff --git a/live-build/auto/build b/live-build/auto/build
index e75c2149..7833560e 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -325,6 +325,11 @@ if [ "$PROJECT" = "ubuntu-core" ] && [ "$SUBPROJECT" = "system-image" ]; then
 
     # rename to have the right prefix etc
     mv device.tar.gz "$PREFIX.device.tar.gz"
+    
+    # azure specific tarball
+    if [ -e device-azure.tar.gz ]; then
+        mv device-azure.tar.gz "$PREFIX.azure.device.tar.gz"
+    fi
 fi
 
 for FLAVOUR in $LB_LINUX_FLAVOURS; do
diff --git a/live-build/auto/config b/live-build/auto/config
index 89999705..d8c46db4 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -356,6 +356,16 @@ case $PROJECT in
                         add_package install isc-dhcp-client
                         add_package install resolvconf
 
+                        # add special azure package
+                        case $ARCH in
+                            amd64)
+                                # will be removed later when the azure
+                                # specific device tarfile is created
+                                add_package install walinuxagent
+                                ;;
+                        esac
+
+                        # generic kernel etc
                         case $ARCH in
 			    i386|amd64)	
 			        add_package install grub-pc
diff --git a/live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary
deleted file mode 100644
index 769abcee..00000000
--- a/live-build/ubuntu-core/hooks/09-move-kernel-to-device-tar.binary
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-#
-# move the kernel out into a new device tarfile with system/boot 
-
-set -e
-
-echo "I: Moving kernel into device tarball"
-
-HERE="$(pwd)"
-TMPDIR="$(mktemp -d)"
-mkdir -p $TMPDIR/system/
-
-# cp files, we can't simply use tar --transform as it changes the symlink target
-(
- cd binary/boot/filesystem.dir 
- cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/
- cp -ar --parent lib/modules/ $TMPDIR/system/
- if [ -e vmlinu? ] && [ -e initrd.img ]; then
-     cp -ar --parent vmlinu? initrd.img $TMPDIR/system
- fi
-)
-
-# and tar it up
-(
- cd $TMPDIR
- tar -c -z -f $HERE/device.tar.gz system
-)
-rm -rf $TMPDIR
-
-# remove files from the root filesystem
-rm -f binary/boot/filesystem.dir/boot/vmlinu?-*
-rm -f binary/boot/filesystem.dir/boot/initrd.img-*
-rm -f binary/boot/filesystem.dir/boot/abi-*
-rm -f binary/boot/filesystem.dir/boot/System.map-*
-rm -f binary/boot/filesystem.dir/initrd.img
-rm -f binary/boot/filesystem.dir/vmlinu?
-rm -rf binary/boot/filesystem.dir/lib/modules
diff --git a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot
index 39614ac9..7f7a847e 100644
--- a/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot
+++ b/live-build/ubuntu-core/hooks/11-remove-extra-packages.chroot
@@ -5,5 +5,7 @@ set -e
 # we want a really minimal image
 apt-get remove -y locales
 
-# this will also get rid of libqt
+# this will also get rid of libqt5 - this can be removed once
+# system-image-cli in vivid does no longer depend on 
+# ubuntu-download-manager
 apt-get remove -y libicu52
diff --git a/live-build/ubuntu-core/hooks/12-add-docker-user.chroot b/live-build/ubuntu-core/hooks/12-add-docker-user.chroot
index b6d6d134..bc805186 100644
--- a/live-build/ubuntu-core/hooks/12-add-docker-user.chroot
+++ b/live-build/ubuntu-core/hooks/12-add-docker-user.chroot
@@ -14,3 +14,5 @@ adduser --system \
         --no-create-home \
         $USER
 
+# ensure that the ubuntu user has the right group
+adduser ubuntu docker
diff --git a/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
new file mode 100644
index 00000000..4dab955a
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/400-create-apt-get-warning.binary
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -ex
+
+echo "I: Creating warning to use snappy when apt-get is used"
+
+PREFIX=binary/boot/filesystem.dir
+
+mkdir -p $PREFIX/usr/local/bin
+cat >$PREFIX/usr/local/bin/apt-get <<EOF
+#!/bin/sh
+echo "apt is not available on snappy Ubuntu! Try our snappy command to install"
+echo "and update your system"
+EOF
+chmod 755 $PREFIX/usr/local/bin/apt-get
diff --git a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
new file mode 100644
index 00000000..a12fde07
--- /dev/null
+++ b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# move the kernel out into a new device tarfile with system/boot 
+
+set -e
+
+echo "I: Moving kernel into device tarball"
+
+HERE="$(pwd)"
+TMPDIR="$(mktemp -d)"
+mkdir -p $TMPDIR/system/
+
+# cp files, we can't simply use tar --transform as it changes the symlink target
+(
+ cd binary/boot/filesystem.dir 
+ cp -ar --parent boot/vmlinu?-* boot/initrd.img-* boot/abi-* boot/System.map-* $TMPDIR/system/
+ cp -ar --parent lib/modules/ $TMPDIR/system/
+ if [ -e vmlinu? ] && [ -e initrd.img ]; then
+     cp -ar --parent vmlinu? initrd.img $TMPDIR/system
+ fi
+)
+# and tar it up
+(
+ cd $TMPDIR
+ tar -c -z -f $HERE/device.tar.gz system
+)
+
+# now build the azure device tarball by adding walinuxagent
+if [ -e binary/boot/filesystem.dir/var/lib/dpkg/info/walinuxagent.list ];
+then
+(
+ cd binary/boot/filesystem.dir 
+ while read line; do
+     line=$(echo $line |cut -d/ -f2-)
+     if [ -e "$line" ] && [ ! -d "$line" ]; then
+         cp -ar --parent $line $TMPDIR/system
+     fi
+ done < var/lib/dpkg/info/walinuxagent.list
+ # created by walinuxagent postinst/dh-systemd
+ cp -ar --parent var/lib/systemd/deb-systemd-helper-enabled/walinuxagent* $TMPDIR/system
+ cp -ar --parent etc/systemd/system/multi-user.target.wants/walinuxagent* $TMPDIR/system
+ mkdir -p $TMPDIR/system/var/lib/waagent
+)
+# and tar it up
+(
+ cd $TMPDIR
+ tar -c -z -f $HERE/device-azure.tar.gz system
+)
+fi
+rm -rf $TMPDIR
+
+# remove files from the root filesystem
+(cd binary/boot/filesystem.dir
+ rm -f boot/vmlinu?-*
+ rm -f boot/initrd.img-*
+ rm -f boot/abi-*
+ rm -f boot/System.map-*
+ rm -f initrd.img
+ rm -f vmlinu?
+ rm -rf lib/modules
+ # remove walinuxagent
+ if [ -e var/lib/dpkg/info/walinuxagent.list ]; then
+     chroot . dpkg --purge walinuxagent || true
+ fi
+)