diff --git a/cli/command/manifest/util.go b/cli/command/manifest/util.go
index 7464a1d183..26de5bf663 100644
--- a/cli/command/manifest/util.go
+++ b/cli/command/manifest/util.go
@@ -35,6 +35,7 @@ var validOSArches = map[osArch]bool{
 	{os: "linux", arch: "ppc64le"}:   true,
 	{os: "linux", arch: "mips64"}:    true,
 	{os: "linux", arch: "mips64le"}:  true,
+	{os: "linux", arch: "riscv64"}:   true,
 	{os: "linux", arch: "s390x"}:     true,
 	{os: "netbsd", arch: "386"}:      true,
 	{os: "netbsd", arch: "amd64"}:    true,
diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 0c0fa986af..5edc7ec6dc 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -4186,6 +4186,7 @@ _docker_manifest_annotate() {
 				mips64
 				mips64le
 				ppc64le
+				riscv64
 				s390x" -- "$cur" ) )
 			return
 			;;