diff --git a/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch b/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch
new file mode 100644
index 0000000000000..eb7b1faceb558
--- /dev/null
+++ b/net-p2p/syncthing/files/syncthing-1.29.5-remove_race_in_tests.patch
@@ -0,0 +1,15 @@
+This patch removes conditional appending of "-race" flag.
+It is needed as we build in PIE mode and race is incompatible with that.
+
+https://bugs.gentoo.org/955442
+--- a/build.go
++++ b/build.go
+@@ -396,7 +396,7 @@
+ 	}
+ 	args = append(args, "-timeout", timeout)
+ 
+-	if runtime.GOARCH == "amd64" {
++	if false {
+ 		switch runtime.GOOS {
+ 		case buildpkg.Darwin, buildpkg.Linux, buildpkg.FreeBSD: // , "windows": # See https://github.com/golang/go/issues/27089
+ 			args = append(args, "-race")
diff --git a/net-p2p/syncthing/syncthing-1.29.5.ebuild b/net-p2p/syncthing/syncthing-1.29.5.ebuild
index 9311a848e387b..4648a8dafd6c4 100644
--- a/net-p2p/syncthing/syncthing-1.29.5.ebuild
+++ b/net-p2p/syncthing/syncthing-1.29.5.ebuild
@@ -31,6 +31,7 @@ DOCS=( AUTHORS {GOALS,README}.md )
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.3.4-TestIssue5063_timeout.patch
 	"${FILESDIR}"/${PN}-1.18.4-tool_users.patch
+	"${FILESDIR}"/${PN}-1.29.5-remove_race_in_tests.patch #955442
 )
 
 src_prepare() {