diff --git a/changelog b/changelog
index f3d2912dc..79a460f8e 100644
--- a/changelog
+++ b/changelog
@@ -9,8 +9,10 @@ libreoffice (4:26.2.0~beta1-2) UNRELEASED; urgency=medium
   * debian/rules:
     - use --enable-ld=mold if building rust-uno-bindings on riscv64 to speed up
       its linking/make it work
+    - enable --enable-rust-uno on riscv64 (test-wise, it generally works and linking is
+      far better with the above and does not hang anymore; compile still takes long but
+      let's see - with parallelism output still might happen...)
   * debian/tests/test-rust_uno-example: increase timeout to 60s
-
   * debian/*.symbols*:
     - mark GLIBCXX_3.4 as optional, vanished in a (mold-using) riscv64 build, is
       not in our namespace anyway and we get a far more uptodate libstdc++6
diff --git a/control b/control
index d49afbc28..5833a4709 100644
--- a/control
+++ b/control
@@ -5316,7 +5316,7 @@ Description: LibreOfficeKit -- headers
 
 Package: librust-rust-uno-dev
 Section: rust
-Architecture: amd64 arm64 loong64 mips64el s390x sparc64 i386
+Architecture: amd64 arm64 loong64 mips64el riscv64 s390x sparc64 i386
 Depends: libreoffice-core, libreoffice-dev
 Built-Using: ${cargo:Built-Using}
 Static-Built-Using: ${cargo:Static-Built-Using}
@@ -5329,7 +5329,7 @@ Description: Rust FFI binding for LibreOffice UNO API - Rust source code
 Package: libreoffice-rust-uno-example
 Section: rust
 Priority: extra
-Architecture: amd64 arm64 loong64 mips64el s390x sparc64 i386
+Architecture: amd64 arm64 loong64 mips64el riscv64 s390x sparc64 i386
 Depends: libreoffice-writer (>= 4:26.2.0~alpha0~) | libreoffice-writer-nogui (>= 4:26.2.0~alpha0~),
          ${shlibs:Depends}
 Suggests: librust-rust-uno-dev
diff --git a/rules b/rules
index 8e43bc523..ed3397c64 100755
--- a/rules
+++ b/rules
@@ -757,13 +757,10 @@ OOO_RUST_ARCHS := amd64 arm64 armel armhf i386 loong64 mips64el ppc64 ppc64el ri
 $(eval $(call gen_no_archs,OOO_RUST_ARCHS))
 #OOO_YRS_ARCHS := $(OOO_RUST_ARCHS))
 #$(eval $(call gen_no_archs,OOO_YRS_ARCHS))
-# no riscv64, takes far too long to compile the big "combined" generated .cxx file/link the UNO bindings...
-# Tried only on ricci but probably that would also happen on the buildds. And e.g. creating the big .cxx file
-# is hardcoded in rustmaker....
 # armhf/powerpc got cc1plus: out of memory allocating 67108852 bytes after a total of 69656576 bytes
 # Let's disable it on all 32bit architectures
 # ppc64(el): doesn't work, see https://lists.debian.org/debian-powerpc/2025/12/msg00002.html ff.
-OOO_RUST_UNO_ARCHS := $(filter-out $(OOO_32BIT_ARCHS) ppc64 ppc64el riscv64,$(OOO_RUST_ARCHS))
+OOO_RUST_UNO_ARCHS := $(filter-out $(OOO_32BIT_ARCHS) ppc64 ppc64el,$(OOO_RUST_ARCHS))
 # i386 worked even though 32bit so keep that for now
 OOO_RUST_UNO_ARCHS += i386
 $(eval $(call gen_no_archs,OOO_RUST_UNO_ARCHS))
diff --git a/tests/control b/tests/control
index 8e30e5ac9..c243577e9 100644
--- a/tests/control
+++ b/tests/control
@@ -148,19 +148,19 @@ Depends: @builddeps@, libreoffice-core, libreoffice-writer, libreoffice-calc, li
 Restrictions: allow-stderr, skippable
 
 Tests: cargo-rust-uno-check
-Architecture: amd64 arm64 loong64 mips64el s390x sparc64 i386
+Architecture: amd64 arm64 loong64 mips64el riscv64 s390x sparc64 i386
 # mostly taken from the autogenerated stuff debcargo would do
 Depends: dh-cargo (>= 31), rustc, librust-rust-uno-dev
 Restrictions: allow-stderr, skip-not-installable, superficial, needs-root
 
 Tests: cargo-rust-uno-test
-Architecture: amd64 arm64 loong64 mips64el s390x sparc64 i386
+Architecture: amd64 arm64 loong64 mips64el riscv64 s390x sparc64 i386
 # mostly taken from the autogenerated stuff debcargo would do
 Depends: dh-cargo (>= 31), rustc, librust-rust-uno-dev
 Restrictions: allow-stderr, skip-not-installable, superficial
 
 Tests: test-rust_uno-example
-Architecture: amd64 arm64 loong64 mips64el s390x sparc64 i386
+Architecture: amd64 arm64 loong64 mips64el riscv64 s390x sparc64 i386
 Depends: libreoffice-writer-nogui, libreoffice-rust-uno-example
 Restrictions: allow-stderr, superficial, skippable, breaks-testbed