diff --git a/debian/changelog b/debian/changelog
index cc50de2c..e7cf3269 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,10 @@ llvm-toolchain-12 (1:12.0.0~++rc2-1~exp2) experimental; urgency=medium
     And all libomptarget.so.12
   * Only enable libomp-12-doc on supported archs
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Mon, 01 Mar 2021 10:53:05 +0100
+  [ Matthias Klose <doko@ubuntu.com> ]
+  * Build using GCC 11 on riscv64.
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 02 Mar 2021 13:25:24 +0100
 
 llvm-toolchain-12 (1:12.0.0~++rc2-1~exp1) experimental; urgency=medium
 
diff --git a/debian/control b/debian/control
index 3f6f9db0..7b2e9fa8 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
     libjsoncpp-dev, pkg-config,
     lcov, procps, help2man, zlib1g-dev,
     g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
+    g++-11 [riscv64],
     libjs-mathjax, python3-recommonmark,
     doxygen, gfortran,
     ocaml-nox [amd64 arm64 armhf ppc64el s390x],
diff --git a/debian/rules b/debian/rules
index 4558c824..1b00b7c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,6 +75,10 @@ ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' g++
 	GCC_VERSION := 4.9
 endif
 
+ifneq (,$(filter $(DEB_HOST_ARCH),riscv64))
+	GCC_VERSION := 11
+endif
+
 Z3_FLAG = -DLLVM_ENABLE_Z3_SOLVER=OFF
 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' libz3-dev) gt 4.7.0; echo $$?),0)
 # no ocaml support in main for Ubuntu