diff --git a/debian/changelog b/debian/changelog
index 407b4b2a..138a94f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.765.7) jammy; urgency=medium
+
+  * Install wpasupplicant by default as for now, most of the RISC-V boards
+    embed a Wifi chipset (LP: #1983008)
+
+ -- Alexandre Ghiti <alexandre.ghiti@canonical.com>  Thu, 28 Jul 2022 14:17:11 +0200
+
 livecd-rootfs (2.765.6) jammy; urgency=medium
 
   [ Alexandre Ghiti ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 05d883e8..f32644ad 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -1076,7 +1076,7 @@ case $PROJECT in
 		;;
 esac
 
-case "$ARCH+${SUBARCH:-}" in
+case "$ARCH${SUBARCH:++$SUBARCH}" in
 	arm*+raspi)
 		# Common configuration for all Raspberry Pi image variants (server,
 		# desktop etc.)
@@ -1087,6 +1087,10 @@ case "$ARCH+${SUBARCH:-}" in
 		add_package install linux-firmware-raspi2 pi-bluetooth u-boot-rpi u-boot-tools
 		BINARY_REMOVE_LINUX=false
 		;;
+	riscv*+*)
+		# We'll add wpasupplicant to the seeds when we work on RISC-V seeds.
+		add_package install wpasupplicant
+		;;
 esac
 
 case $PROJECT:${SUBPROJECT:-} in