diff --git a/debian/changelog b/debian/changelog
index 3d7d28be..cd615baf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium
 
+  [ Matthias Klose ]
   * Consolidate disabling CMake's package validation checks a bit.
   * debian/qualify-clang.sh: Skip OpenMP test, if libomp-dev is not available.
   * Disable CMake's package validation check for libLLVM.so.1.
@@ -7,6 +8,10 @@ llvm-toolchain-19 (1:19.1.0~++rc4-3) UNRELEASED; urgency=medium
   * Generate debian/tests/* files.
   * Disable the usage-wrapper/memory tracking by default.
 
+  [ Aurelien Jarno ]
+  * Enable lldb on riscv64.
+  * Enable lldb autopkgtest on riscv64.
+
  -- Matthias Klose <doko@debian.org>  Thu, 05 Sep 2024 10:59:19 +0200
 
 llvm-toolchain-19 (1:19.1.0~++rc4-2) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index d33fa110..420cc01d 100644
--- a/debian/control
+++ b/debian/control
@@ -565,8 +565,8 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-19
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version}),
  python3-lldb-19
 Pre-Depends: ${misc:Pre-Depends}
@@ -577,8 +577,8 @@ Description: Next generation, high-performance debugger
 
 Package: liblldb-19
 Provides: ${t64:Provides}
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm19 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
@@ -591,8 +591,8 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-19
 Section: python
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-19 (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
@@ -607,8 +607,8 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-19-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-19 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, header files
diff --git a/debian/control.in b/debian/control.in
index 271607f2..4257d6d5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -565,8 +565,8 @@ Description: LLVM-based linker, header files
 # ------------- lldb -------------
 
 Package: lldb-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}),
  python3-lldb-@LLVM_VERSION@
 Pre-Depends: ${misc:Pre-Depends}
@@ -577,8 +577,8 @@ Description: Next generation, high-performance debugger
 
 Package: liblldb-@LLVM_VERSION@
 Provides: ${t64:Provides}
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
@@ -591,8 +591,8 @@ Description: Next generation, high-performance debugger, library
 
 Package: python3-lldb-@LLVM_VERSION@
 Section: python
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, liblldb-@LLVM_VERSION@ (= ${binary:Version})
 Conflicts: python3-lldb-x.y
 Replaces: python3-lldb-x.y
@@ -607,8 +607,8 @@ Description: Next generation, high-performance debugger, python3 lib
 
 Package: liblldb-@LLVM_VERSION@-dev
 Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64
-# ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed
+Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 loong64 riscv64
+# ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 mipsel mips64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-@LLVM_VERSION@ (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, header files
diff --git a/debian/rules b/debian/rules
index 09ad377f..82f874f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -482,7 +482,7 @@ else
 endif
 
 LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 riscv64 sparc64 mips64el mipsel
+LLDB_DISABLE_ARCHS := hurd-amd64 hurd-i386 ia64 powerpc powerpcspe ppc64 sparc64 mips64el mipsel
 # hurd has threading issues
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.
diff --git a/debian/tests/control b/debian/tests/control
index 94b20ede..c8a86385 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -19,7 +19,7 @@ Depends: gcc, build-essential, cmake, llvm-19-dev, clang-19, libclang-19-dev
 
 Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)"
 Depends: python3-lldb-19
-Architecture: amd64 arm64 armel armhf i386 ppc64el s390x
+Architecture: amd64 arm64 armel armhf i386 ppc64el riscv64 s390x
 
 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)"
 Depends: python3-clang-19
diff --git a/debian/tests/control.in b/debian/tests/control.in
index 08435165..e3ec60b4 100644
--- a/debian/tests/control.in
+++ b/debian/tests/control.in
@@ -19,7 +19,7 @@ Depends: gcc, build-essential, cmake, llvm-@LLVM_VERSION@-dev, clang-@LLVM_VERSI
 
 Test-Command: python3 -c "import lldb; print(lldb.__file__); print(lldb)"
 Depends: python3-lldb-@LLVM_VERSION@
-Architecture: amd64 arm64 armel armhf i386 ppc64el s390x
+Architecture: amd64 arm64 armel armhf i386 ppc64el riscv64 s390x
 
 Test-Command: python3 -c "import clang; print(clang.__file__); print(clang)"
 Depends: python3-clang-@LLVM_VERSION@