diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index baea456..b415905 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -300,6 +300,16 @@ jobs:
           asset_name: nebula-linux-mips-softfloat.tar.gz
           asset_content_type: application/gzip
 
+      - name: Upload linux-riscv64
+        uses: actions/upload-release-asset@v1.0.1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: ./linux-latest/nebula-linux-riscv64.tar.gz
+          asset_name: nebula-linux-riscv64.tar.gz
+          asset_content_type: application/gzip
+
       - name: Upload freebsd-amd64
         uses: actions/upload-release-asset@v1.0.1
         env:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51b4c65..2230efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - SSH `print-cert` has a new `-raw` flag to get the PEM representation of a certificate. (#483)
+- New build architecture: Linux `riscv64`. (#542)
 
 ### Fixed
 
diff --git a/Makefile b/Makefile
index 89cf5e3..2a488b5 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,8 @@ ALL_LINUX = linux-amd64 \
 	linux-mipsle \
 	linux-mips64 \
 	linux-mips64le \
-	linux-mips-softfloat
+	linux-mips-softfloat \
+	linux-riscv64
 
 ALL = $(ALL_LINUX) \
 	darwin-amd64 \
diff --git a/udp_linux_64.go b/udp_linux_64.go
index 3ed1c2e..1639a88 100644
--- a/udp_linux_64.go
+++ b/udp_linux_64.go
@@ -1,5 +1,5 @@
 // +build linux
-// +build amd64 arm64 ppc64 ppc64le mips64 mips64le s390x
+// +build amd64 arm64 ppc64 ppc64le mips64 mips64le s390x riscv64
 // +build !android
 // +build !e2e_testing