diff --git a/debian/changelog b/debian/changelog
index 69d37f38..f69be911 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ debian-cd (3.1.17) UNRELEASED; urgency=medium
     uncompressed versions from the output disc. Closes: #767253. Initial
     patch from Michael Vogt - thanks!
   * Add 586 kernels to replace 486 for i386 CDs
+  * More tweaks for arm64 CD building
 
  -- Steve McIntyre <93sam@debian.org>  Wed, 29 Oct 2014 17:33:10 +0000
 
diff --git a/tools/boot/jessie/boot-arm64 b/tools/boot/jessie/boot-arm64
index ab1f820b..da41cce0 100755
--- a/tools/boot/jessie/boot-arm64
+++ b/tools/boot/jessie/boot-arm64
@@ -65,6 +65,10 @@ for image in $BOOT_IMAGES; do
     fi
 done
 
+mkdir -p $CDDIR/$INSTALLDIR
+cp -lf cdrom/vmlinuz $CDDIR/$INSTALLDIR/
+cp -lf cdrom/initrd.gz $CDDIR/$INSTALLDIR/
+
 # Boot setup including config and help files comes from d-i.
 mkdir -pv $PWD/boot$N
 cat cdrom/debian-cd_info.tar.gz | (cd boot$N/; tar zx)
@@ -127,6 +131,11 @@ if [ -d boot$N/grub ] ; then
     fi      
 else
     echo "  No EFI boot code for $ARCH on CD$N"
+
+    # Finally, belt and braces - fix up the %install% entries in grub
+    # in case they're still there
+    sed -i "s,\%install\%,$INSTALLDIR,g" $CDDIR/boot/grub/grub.cfg
+
 fi
 
 # th,th, thats all