diff --git a/add-support-riscv64.patch b/add-support-riscv64.patch
new file mode 100644
index 0000000..6fe6287
--- /dev/null
+++ b/add-support-riscv64.patch
@@ -0,0 +1,29 @@
+diff --git a/CPU.xs b/CPU.xs
+index 067c9cb..53e806b 100644
+--- a/CPU.xs
++++ b/CPU.xs
+@@ -400,6 +400,9 @@ CODE:
+ #endif
+ #if defined __s390__ || defined __s390x__
+     value = processor_machine_field (proc_cpuinfo_field ("processor") );
++#endif
++#if defined __riscv
++    value = proc_cpuinfo_field ("processor");
+ #endif
+     if (!value) value = proc_cpuinfo_field ("model name");
+     if (!value) value = proc_cpuinfo_field ("machine");
+diff --git a/t/Sys-CPU.t b/t/Sys-CPU.t
+index 4246b22..e813514 100755
+--- a/t/Sys-CPU.t
++++ b/t/Sys-CPU.t
+@@ -25,8 +25,8 @@ if (defined($speed)) {
+     print "ok 3 (CPU Speed : $speed)\n";
+ } elsif ( $^O eq 'MSWin32'){
+     print "ok 3 (CPU Speed: test skipped on MSWin32)\n";
+-} elsif ($Config{archname} =~ /^(arm|aarch64)/ ) {
+-    print "ok 3 (CPU Speed: test skipped on ARM and AArch64)\n";
++} elsif ($Config{archname} =~ /^(arm|aarch64|riscv64)/ ) {
++    print "ok 3 (CPU Speed: test skipped on ARM, AArch64 and RISC-V RV64GC)\n";
+ } else  {
+     print "not ok 3 (cpu_clock undefined (ok if Win9x))\n";
+ }
diff --git a/perl-Sys-CPU.spec b/perl-Sys-CPU.spec
index 83e63f9..755f7e6 100644
--- a/perl-Sys-CPU.spec
+++ b/perl-Sys-CPU.spec
@@ -1,6 +1,6 @@
 Name:           perl-Sys-CPU
 Version:        0.61
-Release:        22%{?dist}
+Release:        22.0.riscv64%{?dist}
 Summary:        Getting CPU information
 
 # Some code was copied from Unix::Processors, which is LGPLv3 or Artistic 2.0
@@ -13,6 +13,8 @@ Source0:        https://cpan.metacpan.org/authors/id/M/MZ/MZSANFORD/Sys-CPU-%{ve
 Patch0:         Sys-CPU-0.61-Add-support-for-cpu_type-on-ARM-and-AArch64-Linux-pl.patch
 # Accept undefined cpu_clock on ARM and AArch64, bug #1093266, CPAN RT#95400
 Patch1:         Sys-CPU-0.61-cpu_clock-can-be-undefined-on-an-ARM.patch
+# Add support for RISC-V 64-bit (RV64GC) aka riscv64
+Patch2:         add-support-riscv64.patch
 BuildRequires:  findutils
 BuildRequires:  gcc
 BuildRequires:  make
@@ -59,6 +61,9 @@ find %{buildroot} -type f -name CPU.bs -exec rm -f {} ';'
 
 
 %changelog
+* Thu Jul 16 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 0.61-22
+- Add support for riscv64
+
 * Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.61-22
 - Perl 5.32 rebuild