diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 146a43f0..6212a8fe 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -15,18 +15,17 @@ SETS="
 	lp64d_200_systemd
 	lp64_200_openrc
 	lp64_200_systemd
+	multilib_200_openrc
 "
 
 # riscv32 does not work yet
 #	ilp32
-# multilib needs re-bootstrapping
-
-SET_multilib_SPECS="stage1-multilib.spec stage3-multilib.spec"
 
 SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
 SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
 SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec"
 SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-systemd.spec"
+SET_multilib_200_openrc_SPECS="stage1-multilib-20.0-openrc.spec stage3-multilib-20.0-openrc.spec"
 
 SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"