diff --git a/openssl-1_1.changes b/openssl-1_1.changes
index 8e0751c..c2414c8 100644
--- a/openssl-1_1.changes
+++ b/openssl-1_1.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 28 14:19:34 UTC 2022 - Andreas Schwab <schwab@suse.de>
+
+- openssl-riscv64-config.patch: backport of riscv64 config support
+
 -------------------------------------------------------------------
 Thu Jun 23 04:55:58 UTC 2022 - Jason Sikes <jsikes@suse.com>
 
diff --git a/openssl-1_1.spec b/openssl-1_1.spec
index 5dbd58b..d68f6e8 100644
--- a/openssl-1_1.spec
+++ b/openssl-1_1.spec
@@ -62,6 +62,7 @@ Patch2:         openssl-truststore.patch
 Patch3:         openssl-pkgconfig.patch
 Patch4:         openssl-DEFAULT_SUSE_cipher.patch
 Patch5:         openssl-ppc64-config.patch
+Patch6:         openssl-riscv64-config.patch
 # PATCH-FIX-UPSTREAM jsc#SLE-6126 and jsc#SLE-6129
 Patch8:         0001-s390x-assembly-pack-perlasm-support.patch
 Patch9:         0002-crypto-chacha-asm-chacha-s390x.pl-add-vx-code-path.patch
diff --git a/openssl-riscv64-config.patch b/openssl-riscv64-config.patch
new file mode 100644
index 0000000..c45ef1e
--- /dev/null
+++ b/openssl-riscv64-config.patch
@@ -0,0 +1,12 @@
+Index: openssl-1.1.1p/config
+===================================================================
+--- openssl-1.1.1p.orig/config
++++ openssl-1.1.1p/config
+@@ -639,6 +639,7 @@ case "$GUESSOS" in
+             OUT="linux-elf"
+         fi ;;
+   *86-*-linux1) OUT="linux-aout" ;;
++  riscv64-*-linux?) OUT="linux64-riscv64" ;;
+   *-*-linux?) OUT="linux-generic32" ;;
+   sun4[uv]*-*-solaris2)
+ 	OUT="solaris-sparcv9-$CC"