diff --git a/Pkgfile b/Pkgfile
index fd0f467..0ef795d 100644
--- a/Pkgfile
+++ b/Pkgfile
@@ -31,6 +31,11 @@ vars:
   make_sha256: dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3
   make_sha512: 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c
 
+  # renovate: datasource=github-tags extractVersion=^go(?<version>.*)$ depName=golang/go
+  golang_version: 1.23.4
+  golang_sha256: ad345ac421e90814293a9699cca19dd5238251c3f687980bbcae28495b263531
+  golang_sha512: 5d1cce76b2cbdf628f86a1a8185a07f362becee053cb4270281520e77b36e3908faeaf5b2a6266e61dec9866dc1f3791f77e8dc1bf5f8beaf858c138d0e18c22
+
   # renovate: datasource=git-tags depName=https://gitlab.inria.fr/mpc/mpc.git
   mpc_version: 1.3.1
   mpc_sha256: ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8
diff --git a/deps.png b/deps.png
index b152d34..6939b69 100644
Binary files a/deps.png and b/deps.png differ
diff --git a/golang/pkg.yaml b/golang/pkg.yaml
new file mode 100644
index 0000000..9ab9e1d
--- /dev/null
+++ b/golang/pkg.yaml
@@ -0,0 +1,40 @@
+name: golang
+install:
+  - go
+dependencies:
+  - stage: binutils
+steps:
+  - sources:
+      - url: https://dl.google.com/go/go{{ .golang_version }}.src.tar.gz
+        destination: go.src.tar.gz
+        sha256: "{{ .golang_sha256 }}"
+        sha512: "{{ .golang_sha512 }}"
+
+    env:
+      GOROOT_FINAL: '{{ .TOOLCHAIN }}/go'
+
+    prepare:
+      - tar -xzf go.src.tar.gz --strip-components=1
+      - rm go.src.tar.gz
+
+    build:
+      - cd src && sh make.bash
+    install:
+      - rm -rf pkg/obj
+      - rm -rf pkg/bootstrap
+      - rm -f pkg/tool/*/api
+      - |
+        find src \( -type f -a -name "*_test.go" \) \
+        -exec rm -rf \{\} \+
+      - |
+        find src \( -type d -a -name "testdata" \) \
+        -exec rm -rf \{\} \+
+      - |
+        find src -type f -a \( -name "*.bash" -o -name "*.rc" -o -name "*.bat" \) \
+        -exec rm -rf \{\} \+
+
+      - mkdir -p "${GOROOT_FINAL}"
+      - mv * "${GOROOT_FINAL}"
+finalize:
+  - from: "{{ .TOOLCHAIN }}"
+    to: "{{ .TOOLCHAIN }}"
diff --git a/toolchain/pkg.yaml b/toolchain/pkg.yaml
index bd8480b..9e10918 100644
--- a/toolchain/pkg.yaml
+++ b/toolchain/pkg.yaml
@@ -5,6 +5,7 @@ dependencies:
   - stage: linux-headers
   - stage: musl
   - stage: make
+  - stage: golang
 steps:
   - env:
       PATH: "{{ .TOOLCHAIN }}/bin:{{ .PATH }}"