diff --git a/docs/api/api/obs.rng b/docs/api/api/obs.rng
index 8e7cec8e861..a6d74581ab3 100644
--- a/docs/api/api/obs.rng
+++ b/docs/api/api/obs.rng
@@ -48,6 +48,8 @@
       <value>ppc64p7</value>
       <value>ppc64le</value>
 
+      <value>riscv64</value>
+
       <value>s390</value>
       <value>s390x</value>
 
diff --git a/src/api/db/data/20180131174510_add_riscv64.rb b/src/api/db/data/20180131174510_add_riscv64.rb
new file mode 100644
index 00000000000..839cd0ebf3b
--- /dev/null
+++ b/src/api/db/data/20180131174510_add_riscv64.rb
@@ -0,0 +1,9 @@
+class AddRiscv64 < ActiveRecord::Migration[5.1]
+  def self.up
+    Architecture.where(name: 'riscv64').first_or_create
+  end
+
+  def self.down
+    Architecture.find_by_name('riscv64').destroy
+  end
+end
diff --git a/src/api/db/seeds.rb b/src/api/db/seeds.rb
index a7e587acada..c046562320e 100644
--- a/src/api/db/seeds.rb
+++ b/src/api/db/seeds.rb
@@ -5,7 +5,7 @@
 # but kept for compatibility reasons. armv7hl is in for compatibility (soft/hard).
 ['aarch64', 'aarch64_ilp32', 'armv4l', 'armv5l', 'armv6l', 'armv7l', 'armv5el', 'armv6el', 'armv7el',
  'armv7hl', 'armv8el', 'hppa', 'i586', 'i686', 'ia64', 'k1om', 'local', 'm68k', 'mips', 'mips32',
- 'mips64', 'ppc', 'ppc64', 'ppc64p7', 'ppc64le', 's390', 's390x', 'sparc', 'sparc64', 'sparc64v',
+ 'mips64', 'ppc', 'ppc64', 'ppc64p7', 'ppc64le', 'riscv64', 's390', 's390x', 'sparc', 'sparc64', 'sparc64v',
  'sparcv8', 'sparcv9', 'sparcv9v', 'x86_64'].each do |arch_name|
 
   Architecture.where(name: arch_name).first_or_create
diff --git a/src/backend/BSCando.pm b/src/backend/BSCando.pm
index c8656b9ab08..221dbd5a773 100644
--- a/src/backend/BSCando.pm
+++ b/src/backend/BSCando.pm
@@ -58,6 +58,8 @@ our %cando = (
 
   'ia64'    => [ 'ia64' ],
 
+  'riscv64' => [ 'riscv64' ],
+
   's390'    => [ 's390' ],
   's390x'   => [ 's390x', 's390:linux32' ],
 
diff --git a/src/backend/bs_publish b/src/backend/bs_publish
index 22940ffb738..1ad02d1c64b 100755
--- a/src/backend/bs_publish
+++ b/src/backend/bs_publish
@@ -664,6 +664,7 @@ ARCH.ppc64p7 ppc64p7 noarch
 ARCH.ppc64 ppc64 ppc noarch
 ARCH.ppc64le ppc64le noarch
 ARCH.ppc ppc noarch
+ARCH.riscv64 riscv64 noarch
 ARCH.sh4 sh4 noarch
 ARCH.m68k m68k noarch
 ARCH.aarch64 aarch64 aarch64_ilp32 noarch