diff --git a/Mesa-drivers.changes b/Mesa-drivers.changes
index b58751c..0d453e3 100644
--- a/Mesa-drivers.changes
+++ b/Mesa-drivers.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 13 16:11:52 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- Enable LLVM support on riscv64
+
 -------------------------------------------------------------------
 Sun Jan 12 18:09:19 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa-drivers.spec b/Mesa-drivers.spec
index af29006..a281810 100644
--- a/Mesa-drivers.spec
+++ b/Mesa-drivers.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package Mesa-drivers
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -74,7 +74,7 @@
   %endif
 %endif
 
-%ifarch aarch64 %{arm} ppc64 ppc64le s390x %{ix86} x86_64
+%ifarch aarch64 %{arm} ppc64 ppc64le riscv64 s390x %{ix86} x86_64
   %define with_llvm 1
 %endif
 
@@ -466,8 +466,8 @@ applications using the OpenGL|ES 3.x APIs.
 
 %package -n libOSMesa8
 Summary:        Mesa Off-screen rendering extension
-# Wrongly named package shipped .so.8
 Group:          System/Libraries
+# Wrongly named package shipped .so.8
 Obsoletes:      libOSMesa9 < %{version}
 Provides:       libOSMesa9 = %{version}
 
@@ -583,8 +583,8 @@ programs against the GBM library.
 
 %package -n Mesa-libd3d
 Summary:        Mesa Direct3D9 state tracker
-# Manually provide d3d library (bnc#918294)
 Group:          System/Libraries
+# Manually provide d3d library (bnc#918294)
 %ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64
 Provides:       d3dadapter9.so.1()(64bit)
 %else
diff --git a/Mesa.changes b/Mesa.changes
index b58751c..0d453e3 100644
--- a/Mesa.changes
+++ b/Mesa.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jan 13 16:11:52 UTC 2020 - Andreas Schwab <schwab@suse.de>
+
+- Enable LLVM support on riscv64
+
 -------------------------------------------------------------------
 Sun Jan 12 18:09:19 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 
diff --git a/Mesa.spec b/Mesa.spec
index 8a59a23..06b01f6 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package Mesa
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -73,7 +73,7 @@
   %endif
 %endif
 
-%ifarch aarch64 %{arm} ppc64 ppc64le s390x %{ix86} x86_64
+%ifarch aarch64 %{arm} ppc64 ppc64le riscv64 s390x %{ix86} x86_64
   %define with_llvm 1
 %endif
 
@@ -465,8 +465,8 @@ applications using the OpenGL|ES 3.x APIs.
 
 %package -n libOSMesa8
 Summary:        Mesa Off-screen rendering extension
-# Wrongly named package shipped .so.8
 Group:          System/Libraries
+# Wrongly named package shipped .so.8
 Obsoletes:      libOSMesa9 < %{version}
 Provides:       libOSMesa9 = %{version}
 
@@ -582,8 +582,8 @@ programs against the GBM library.
 
 %package -n Mesa-libd3d
 Summary:        Mesa Direct3D9 state tracker
-# Manually provide d3d library (bnc#918294)
 Group:          System/Libraries
+# Manually provide d3d library (bnc#918294)
 %ifarch x86_64 s390x ppc64 ppc64le aarch64 riscv64
 Provides:       d3dadapter9.so.1()(64bit)
 %else