diff --git a/0001-Set-CGO_ENABLED-1-on-riscv64.patch b/0001-Set-CGO_ENABLED-1-on-riscv64.patch
new file mode 100644
index 0000000000000000000000000000000000000000..26aac30c6ece79d70cb564d855d82ed8518c5230
--- /dev/null
+++ b/0001-Set-CGO_ENABLED-1-on-riscv64.patch
@@ -0,0 +1,26 @@
+From 800a51d6cd22ac7b7465d2d408362f9683a11800 Mon Sep 17 00:00:00 2001
+From: Zhuo Zhi <h.dwwwwww@gmail.com>
+Date: Mon, 11 Mar 2024 13:57:35 +0800
+Subject: [PATCH] Set CGO_ENABLED=1 on riscv64
+
+CGO works fine on riscv64 thus should be enabled.
+Avoid build error https://github.com/golang/go/issues/64875
+
+Signed-off-by: Zhuo Zhi <h.dwwwwww@gmail.com>
+---
+ scripts/build/.variables | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/build/.variables b/scripts/build/.variables
+index a9371ebec2b6..de7945d0a7b3 100755
+--- a/scripts/build/.variables
++++ b/scripts/build/.variables
+@@ -48,7 +48,7 @@ if [ -z "$CGO_ENABLED" ]; then
+     case "$(go env GOOS)" in
+         linux)
+             case "$(go env GOARCH)" in
+-                amd64|arm64|arm|s390x)
++                amd64|arm64|arm|s390x|riscv64)
+                     CGO_ENABLED=1
+                 ;;
+                 *)
diff --git a/moby.spec b/moby.spec
index 7d0af1aac0a63b93b08e215331384bb4a050cc80..65054d14a0f90fe11f7da983ff814c155e737615 100644
--- a/moby.spec
+++ b/moby.spec
@@ -8,13 +8,13 @@
 
 Name: 	  moby
 Version:  25.0.7
-Release:  1
+Release:  2
 Summary:  The open-source application container engine
 License:  Apache-2.0
 URL:	  https://www.docker.com
-# https://github.com/docker/cli/archive/refs/tags/v25.0.3.tar.gz
+# https://github.com/docker/cli/archive/refs/tags/v25.0.7.tar.gz
 Source0:  cli-%{version}.tar.gz
-# https://github.com/moby/moby/archive/refs/tags/v25.0.3.tar.gz
+# https://github.com/moby/moby/archive/refs/tags/v25.0.7.tar.gz
 Source1:  moby-%{version}.tar.gz
 # https://github.com/krallin/tini/archive/refs/tags/v0.19.0.tar.gz
 Source2:  tini-0.19.0.tar.gz
@@ -22,6 +22,7 @@ Source3:  docker.service
 Source4:  docker.socket
 Source5:  docker.sysconfig
 # Patch 0001-0999 for cli
+Patch0001:  0001-Set-CGO_ENABLED-1-on-riscv64.patch
 # Patch 1001-1999 for moby
 Patch1002:  1002-fix-cve-2024-32473.patch
 Patch1003:  1003-add-loongarch64-seccomp-support.patch
@@ -218,6 +219,9 @@ fi
 %systemd_postun_with_restart docker.service
 
 %changelog
+* Mon Jan 20 2025 Funda Wang <fundawang@yeah.net> - 25.0.7-2
+- backport cli v26.1.0 patch to fix riscv64 build error
+
 * Tue Jan 14 2025 Funda Wang <fundawang@yeah.net> - 25.0.7-1
 - update to 25.0.7