diff --git a/openblas.changes b/openblas.changes
index da422eb..841d622 100644
--- a/openblas.changes
+++ b/openblas.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 26 08:20:32 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Use RISCV64_GENERIC for riscv64
+- Add -ffat-lto-objects to get proper static archives
+
 -------------------------------------------------------------------
 Thu Jul 22 08:11:06 UTC 2021 - Ismail Dönmez <ismail@i10z.com>
 
diff --git a/openblas.spec b/openblas.spec
index f9ddcf1..fe72a0e 100644
--- a/openblas.spec
+++ b/openblas.spec
@@ -295,6 +295,9 @@ cp %{SOURCE2} .
 %endif
 
 %build
+%if "%{?_lto_cflags}" != ""
+%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
+%endif
 
 # disable lto for ppc64le, boo#1181733
 %ifarch ppc64le
@@ -327,6 +330,9 @@ cp %{SOURCE2} .
 %ifarch ppc64
 %global openblas_target %openblas_target TARGET=POWER8
 %endif
+%ifarch riscv64
+%global openblas_target %openblas_target TARGET=RISCV64_GENERIC
+%endif
 # force -mvsx for ppc64 to avoid build failure:
 # ../kernel/power/sasum_microk_power8.c:41:3: error: '__vector' undeclared (first use in this function); did you mean '__cpow'?
 # TODO why is it required ? (and not for ppc64le)