diff --git a/debian/changelog b/debian/changelog
index 25c111a3..3bbaeaee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
 livecd-rootfs (2.525.13) UNRELEASED; urgency=medium
 
   [ Balint Reczey ]
-  * Update Vcs-* fields in debian/control to point to git. 
+  * Update Vcs-* fields in debian/control to point to git.
 
- -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Thu, 13 Dec 2018 15:22:15 +1300
+  [ Łukasz 'sil2100' Zemczak ]
+  * Add wpasupplicant to the additional packages installed for the raspi2 and
+    raspi3 targets.
+  * Default to IMAGEFORMAT=ubuntu-image for raspi3 ubuntu-cpc builds.
+  * Link the resulting raspi3 image to a filename that cdimage expects from a
+    preinstalled image build.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Fri, 11 Jan 2019 14:53:10 +0100
 
 livecd-rootfs (2.525.12) bionic; urgency=medium
 
diff --git a/live-build/auto/build b/live-build/auto/build
index 273f1a10..6de5a77b 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -45,6 +45,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 		#  define those.
 		mv output/*.img "$PREFIX".img
 		xz -0 -T4 "$PREFIX".img
+		# Also link the output image to a filename that cdimage expects
+		ln "$PREFIX".img.xz livecd.ubuntu-cpc.disk1.img.xz
 		mv output/filesystem.manifest "$PREFIX".manifest
 	fi
 
diff --git a/live-build/auto/config b/live-build/auto/config
index fe82ccad..3d8d5f0a 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -114,7 +114,12 @@ add_binary_hook ()
 if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*)
-			IMAGEFORMAT=ext4
+			if [ "$SUBARCH" = "raspi3" ]; then
+				# For now only raspi3, but others are soon to follow
+				IMAGEFORMAT=ubuntu-image
+			else
+				IMAGEFORMAT=ext4
+			fi
 			;;
 		ubuntu-server:live)
 			IMAGEFORMAT=plain
@@ -806,13 +811,13 @@ case $ARCH in
 				;;
 			raspi2)
 				COMPONENTS='main restricted universe multiverse'
-				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools
+				add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant
 				BINARY_REMOVE_LINUX=false
 				;;
 			raspi3)
 				COMPONENTS='main restricted universe multiverse'
 				KERNEL_FLAVOURS=raspi2
-				add_package install raspi3-firmware u-boot-rpi flash-kernel u-boot-tools
+				add_package install raspi3-firmware u-boot-rpi flash-kernel u-boot-tools wpasupplicant
 				BINARY_REMOVE_LINUX=false
 				;;