diff --git a/debian/changelog b/debian/changelog
index ee827c0d..8505ee53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ livecd-rootfs (2.547) UNRELEASED; urgency=medium
   * Avoid issues of hard-linking to a symbolic vmlinuz as this can lead to a
     dangling symlink.
   * Add raspi3 arm64 rootfs build support.
+  * Add git to the build dependencies for the gadget tree pull.
+  * Minor fixes to raspi3 builds: add arm64+raspi3 to the supported model
+    list, pass SUITE on to the build stage and use the git:// url for the
+    gadget tree.
 
   [ Aleksandr Bogdanov ]
   * vagrant: disabling automatic console log file
diff --git a/debian/control b/debian/control
index 889731c7..a32109b3 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Depends: ${misc:Depends},
          gdisk,
          genisoimage,
          germinate (>= 1.25.1),
+         git,
          gnupg,
          grep-dctrl,
          kpartx,
diff --git a/live-build/auto/config b/live-build/auto/config
index 957d41ad..dcdc0f90 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -171,7 +171,7 @@ case $IMAGEFORMAT in
 				MODEL=dragonboard ;;
 			armhf+raspi2)
 				MODEL=pi2 ;;
-			armhf+raspi3)
+			armhf+raspi3|arm64+raspi3)
 				MODEL=pi3 ;;
 			armhf+cm3)
 				MODEL=cm3 ;;
@@ -213,9 +213,10 @@ case $IMAGEFORMAT in
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"
 
-			git clone lp:~canonical-foundations/snap-$MODEL/+git/github-mirror -b classic config/$PREFIX-gadget
+			git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b classic config/$PREFIX-gadget
 
 			echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
+			echo "SUITE=$SUITE" >> config/common
 			echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 
 			echo "Configured ubuntu-image for the following gadget model: $MODEL"