diff --git a/debian/changelog b/debian/changelog
index e5dc942b..343ce228 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.669) groovy; urgency=medium
+
+  * chroot: disable amd64 codepath on riscv64
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 25 Jun 2020 18:02:51 +0100
+
 livecd-rootfs (2.668) groovy; urgency=medium
 
   [ Łukasz 'sil2100' Zemczak ]
diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
index bc516092..7817c430 100755
--- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot
@@ -116,8 +116,8 @@ fi
 
 
 case $arch in
-	# ARM, ppc and s390 images are special
-	armhf|arm64|powerpc|ppc64el|s390x)
+	# ARM, ppc, riscv64 and s390x images are special
+	armhf|arm64|powerpc|ppc64el|s390x|riscv64)
 		exit 0
 		;;
 esac