diff --git a/libguestfs.changes b/libguestfs.changes
index b07143c..52ee25f 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Dec 16 09:08:08 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Fix build with RPM 4.18: rpm wants to do a proper cleanup, and
+  fails on the design choice to have /usr/lib65 without write
+  permission. As we already tar'ed the content up, we can simply
+  change the permissions of winsupport's content to allow proper
+  erasing.
+
+-------------------------------------------------------------------
+Wed Nov 30 14:34:58 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- Enable build on riscv64
+
 -------------------------------------------------------------------
 Tue Nov 29 11:45:36 MST 2022 - carnold@suse.com
 
diff --git a/libguestfs.spec b/libguestfs.spec
index 4c7411b..a59eaa4 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libguestfs
-ExclusiveArch:  x86_64 ppc64 ppc64le s390x aarch64
+ExclusiveArch:  x86_64 ppc64 ppc64le s390x aarch64 riscv64
 Version:        1.48.6
 Release:        0
 Summary:        Access and modify virtual machine disk images
@@ -104,6 +104,9 @@ sed -i 's|RPMVSF_MASK_NOSIGNATURES|_RPMVSF_NOSIGNATURES|' daemon/rpm-c.c
 %ifarch ppc64
 %define kvm_binary %{_bindir}/qemu-system-ppc64
 %endif
+%ifarch riscv64
+%define kvm_binary %{_bindir}/qemu-system-riscv64
+%endif
 %ifarch s390x
 %define kvm_binary %{_bindir}/qemu-system-s390x
 %endif
@@ -256,6 +259,10 @@ libfuse2
 hwinfo
 EOF
 
+# do some cleanup so that rpm can properly empty directories without permission denie
+# The winsupport directory has already been tar'ed up, so we don't care much
+find winsupport -type d -exec chmod 755 {} \;
+
 mkdir -p %{buildroot}/tmp/usr/bin
 cp %{S:100} %{buildroot}/tmp/usr/bin
 chmod a+x %{buildroot}/tmp/usr/bin/*