diff --git a/lang/go/Makefile b/lang/go/Makefile
index 10dbc0610..b3d32ca36 100644
--- a/lang/go/Makefile
+++ b/lang/go/Makefile
@@ -7,7 +7,7 @@ COMMENT =		Go programming language
 
 # increment _MODGO_SYSTEM_VERSION in go.port.mk after updating to a new
 # version, to trigger updates of go-compiled ports
-VERSION =		1.23.3
+VERSION =		1.23.5
 DISTNAME =		go${VERSION}.src
 PKGNAME =		go-${VERSION}
 PKGSPEC =		${FULLPKGNAME:S/go-/go-=/}
diff --git a/lang/go/distinfo b/lang/go/distinfo
index 3b8c38568..7e5d1d897 100644
--- a/lang/go/distinfo
+++ b/lang/go/distinfo
@@ -3,10 +3,10 @@ SHA256 (go-openbsd-amd64-bootstrap-1.22.5.tar.gz) = vFJP02dfZ2hBhlBtyKwXeoUSKTsz
 SHA256 (go-openbsd-arm-bootstrap-1.22.5.tar.gz) = hd5uX+7C1KPYDhhh3GjexRShYcZR6qOVNmmr7nrINmE=
 SHA256 (go-openbsd-arm64-bootstrap-1.22.5.tar.gz) = jfRynOQVoniG2ZvzZgHExVUEzKFOlfEWPEW43/NaZtQ=
 SHA256 (go-openbsd-riscv64-bootstrap-1.22.5.tar.gz) = 7uKbM7V/XPXVfeJMdEDG57hzhoao5hv1vzpsal+YPiw=
-SHA256 (go1.23.3.src.tar.gz) = jWp3MySHVXxq+iQhExtQ+D20rjxXnDvHLmcO4faWhZk=
+SHA256 (go1.23.5.src.tar.gz) = pvP0u9PmvdYm95tmjyEvu1ZJ2vdQhPt5tnigrk2XQjs=
 SIZE (go-openbsd-386-bootstrap-1.22.5.tar.gz) = 69567775
 SIZE (go-openbsd-amd64-bootstrap-1.22.5.tar.gz) = 79553441
 SIZE (go-openbsd-arm-bootstrap-1.22.5.tar.gz) = 77558960
 SIZE (go-openbsd-arm64-bootstrap-1.22.5.tar.gz) = 76871926
 SIZE (go-openbsd-riscv64-bootstrap-1.22.5.tar.gz) = 77931440
-SIZE (go1.23.3.src.tar.gz) = 28173788
+SIZE (go1.23.5.src.tar.gz) = 28179014
diff --git a/lang/go/go.port.mk b/lang/go/go.port.mk
index 3542fb1df..f99eabc4b 100644
--- a/lang/go/go.port.mk
+++ b/lang/go/go.port.mk
@@ -1,6 +1,6 @@
 # increment after a go compiler update to trigger updates of
 # compiled go packages (see arch-defines.mk)
-_MODGO_SYSTEM_VERSION =	19
+_MODGO_SYSTEM_VERSION =	20
 
 ONLY_FOR_ARCHS ?=	${GO_ARCHS}
 
diff --git a/lang/go/patches/patch-src_time_time_test_go b/lang/go/patches/patch-src_time_time_test_go
deleted file mode 100644
index 583cf5215..000000000
--- a/lang/go/patches/patch-src_time_time_test_go
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: src/time/time_test.go
---- src/time/time_test.go.orig
-+++ src/time/time_test.go
-@@ -1085,7 +1085,7 @@ func TestLoadFixed(t *testing.T) {
- 	name, offset := Now().In(loc).Zone()
- 	// The zone abbreviation is "-01" since tzdata-2016g, and "GMT+1"
- 	// on earlier versions; we accept both. (Issue #17276).
--	if !(name == "GMT+1" || name == "-01") || offset != -1*60*60 {
-+	if !(name == "GMT+1" || name == "-01" || name == "+01") || offset != -1*60*60 {
- 		t.Errorf("Now().In(loc).Zone() = %q, %d, want %q or %q, %d",
- 			name, offset, "GMT+1", "-01", -1*60*60)
- 	}
diff --git a/lang/go/pkg/PLIST b/lang/go/pkg/PLIST
index 1dc9f8a07..662343252 100644
--- a/lang/go/pkg/PLIST
+++ b/lang/go/pkg/PLIST
@@ -570,6 +570,8 @@ go/src/cmd/cgo/internal/testcarchive/carchive_test.go
 go/src/cmd/cgo/internal/testcarchive/testdata/
 go/src/cmd/cgo/internal/testcarchive/testdata/libgo/
 go/src/cmd/cgo/internal/testcarchive/testdata/libgo/libgo.go
+go/src/cmd/cgo/internal/testcarchive/testdata/libgo10/
+go/src/cmd/cgo/internal/testcarchive/testdata/libgo10/a.go
 go/src/cmd/cgo/internal/testcarchive/testdata/libgo2/
 go/src/cmd/cgo/internal/testcarchive/testdata/libgo2/libgo2.go
 go/src/cmd/cgo/internal/testcarchive/testdata/libgo3/
@@ -585,6 +587,7 @@ go/src/cmd/cgo/internal/testcarchive/testdata/libgo8/a.go
 go/src/cmd/cgo/internal/testcarchive/testdata/libgo9/
 go/src/cmd/cgo/internal/testcarchive/testdata/libgo9/a.go
 go/src/cmd/cgo/internal/testcarchive/testdata/main.c
+go/src/cmd/cgo/internal/testcarchive/testdata/main10.c
 go/src/cmd/cgo/internal/testcarchive/testdata/main2.c
 go/src/cmd/cgo/internal/testcarchive/testdata/main3.c
 go/src/cmd/cgo/internal/testcarchive/testdata/main4.c
@@ -1035,6 +1038,7 @@ go/src/cmd/compile/internal/importer/iimport.go
 go/src/cmd/compile/internal/importer/support.go
 go/src/cmd/compile/internal/importer/testdata/
 go/src/cmd/compile/internal/importer/testdata/a.go
+go/src/cmd/compile/internal/importer/testdata/alias.go
 go/src/cmd/compile/internal/importer/testdata/b.go
 go/src/cmd/compile/internal/importer/testdata/exports.go
 go/src/cmd/compile/internal/importer/testdata/generics.go
@@ -8716,6 +8720,7 @@ go/src/net/sendfile_linux.go
 go/src/net/sendfile_stub.go
 go/src/net/sendfile_test.go
 go/src/net/sendfile_unix_alt.go
+go/src/net/sendfile_unix_test.go
 go/src/net/sendfile_windows.go
 go/src/net/server_test.go
 go/src/net/smtp/