diff --git a/app-containers/docker-buildx/Manifest b/app-containers/docker-buildx/Manifest
index fc5222dd8a4e2..81a8e0cc6bc38 100644
--- a/app-containers/docker-buildx/Manifest
+++ b/app-containers/docker-buildx/Manifest
@@ -7,3 +7,4 @@ DIST docker-buildx-0.34.1.tar.gz 15417849 BLAKE2B b302d1f2331ba7f76c79358be19743
 DIST docker-buildx-0.35.0.tar.gz 15243338 BLAKE2B d5529d81cd2745366e46da1f805da6b4b47a4002260c5f351cddafbba4cc55fbad3be182e94d89453de62fdda3adc7bde2713010122439ce72a7cc53e49b3f6f SHA512 208251fe59d016bbb1d34abacab4813169577c474ad62f47afdcce4f2484e8535a452bfa0b8dbadc465590cae935896bfeec2263934262cdb769a27b59b4c5de
 DIST docker-buildx-0.36.1.tar.gz 15022684 BLAKE2B c927c4e310cd72a9cbffb00d637e0c596828ea1ad1aee8725cdaa9163dc100a35c0898b25f7123ed1c926006f7b3e632c4b579eeeeb296cd25b331f9e7d64699 SHA512 669a1fa58570f56dfc6d5a0cf79f09e5a326b997a26a79e9bdbc263b1b847200d6bcc8fa1a37be43a77573d32c04d093959ec793cfd503cef524cbfdb9332339
 DIST docker-buildx-0.37.0.tar.gz 15139877 BLAKE2B 2f0048fc2878054104168eb9e1117c987c6fb44be3f929e5a52bc1554c2c97f91898f35049a74b8320c3ae77ee0a1ffe661fcdd2c28b969ebce33d16659b16c4 SHA512 9b82b4b6e6f27a364dda89c3dcc936db78a49750c7cdc527641f04c736d8987a4efbde9614a91ea151772c9b9d01959ce51de5c6d144820b18b7e3244695bece
+DIST docker-buildx-0.37.1.tar.gz 15141432 BLAKE2B aa3459115826a0fb07a8858052fa8f4e0f7150f23bd5043bd33b90dad9e6c8b8db104d2f75e4d7bc869ae55ca4124d74bd6367371ca9140fe7fefa0aa20cbd73 SHA512 f53f849dd4b71353dccc70864aa9a969397c598ea91f7610046b3ed322360ed6793dd321f05043c36417bf7327c4101f330400a53b466fb205c7493f433af814
diff --git a/app-containers/docker-buildx/docker-buildx-0.37.1.ebuild b/app-containers/docker-buildx/docker-buildx-0.37.1.ebuild
new file mode 100644
index 0000000000000..a339148875b0b
--- /dev/null
+++ b/app-containers/docker-buildx/docker-buildx-0.37.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=9
+
+inherit go-module
+
+DESCRIPTION="Docker CLI plugin for extended build capabilities with BuildKit"
+HOMEPAGE="https://github.com/docker/buildx"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/docker/buildx.git"
+else
+	SRC_URI="https://github.com/docker/buildx/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+	S=${WORKDIR}/${P#docker-}
+fi
+
+LICENSE="Apache-2.0"
+# Dependent licenses
+LICENSE+=" Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0 Unicode-DFS-2016"
+SLOT="0"
+
+RDEPEND="app-containers/docker-cli"
+BDEPEND=">=dev-lang/go-1.26.3"
+
+src_compile() {
+	local _buildx_r='github.com/docker/buildx'
+	local version=${PV}
+	if [[ ${PV} == 9999 ]]; then
+		version="$(git rev-parse --short HEAD)"
+	fi
+	local go_ldflags=(
+		"-linkmode=external"
+		-X "${_buildx_r}/version.Version=${version}"
+		-X "${_buildx_r}/version.Revision=$(date -u +%FT%T%z)"
+		-X "${_buildx_r}/version.Package=${_buildx_r}"
+	)
+	ego build -o docker-buildx -ldflags "${go_ldflags[*]}" ./cmd/buildx
+}
+
+src_test() {
+	# TestGit can't work in a source tarball; TestReadTargets fails seemingly due to parallelism.
+	if [[ ${PV} == 9999 ]]; then
+		ego test ./... -skip "TestReadTargets|TestIntegration"
+	else
+		ego test ./... -skip "TestGit|TestReadTargets|TestIntegration"
+	fi
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe docker-buildx
+
+	einstalldocs
+}