diff --git a/meta/classes/goarch.bbclass b/meta/classes/goarch.bbclass
index 39fea5e3d10..7aaf26aed12 100644
--- a/meta/classes/goarch.bbclass
+++ b/meta/classes/goarch.bbclass
@@ -68,6 +68,8 @@ def go_map_arch(a, d):
         return 'ppc64'
     elif re.match('p(pc|owerpc)(64el)', a):
         return 'ppc64le'
+    elif a == 'riscv64':
+        return 'riscv64'
     else:
         raise bb.parse.SkipRecipe("Unsupported CPU architecture: %s" % a)