diff --git a/lang/go120/Makefile b/lang/go120/Makefile
index 7f4df6ee..6dbdea17 100644
--- a/lang/go120/Makefile
+++ b/lang/go120/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD: head/lang/go/Makefile 470619 2018-05-22 14:32:09Z jlaffaye $
 
 PORTNAME=	go
-PORTVERSION=	1.20.2
+PORTVERSION=	1.20.4
 CATEGORIES=	lang
 MASTER_SITES=	https://golang.org/dl/
 MASTER_SITES+=	https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap
diff --git a/lang/go120/distinfo.amd64 b/lang/go120/distinfo.amd64
index 77c17538..00c5d50b 100644
--- a/lang/go120/distinfo.amd64
+++ b/lang/go120/distinfo.amd64
@@ -1,5 +1,5 @@
-TIMESTAMP = 1679869632
-SHA256 (go1.20.2.src.tar.gz) = 4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab
-SIZE (go1.20.2.src.tar.gz) = 26178725
+TIMESTAMP = 1683219183
+SHA256 (go1.20.4.src.tar.gz) = 9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6
+SIZE (go1.20.4.src.tar.gz) = 26185429
 SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
 SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360
diff --git a/lang/go120/pkg-plist.amd64 b/lang/go120/pkg-plist.amd64
index 229d4662..f2992028 100644
--- a/lang/go120/pkg-plist.amd64
+++ b/lang/go120/pkg-plist.amd64
@@ -399,6 +399,7 @@ lib/go/misc/cgo/testshared/testdata/issue44031/b/b.go
 lib/go/misc/cgo/testshared/testdata/issue44031/main/main.go
 lib/go/misc/cgo/testshared/testdata/issue47837/a/a.go
 lib/go/misc/cgo/testshared/testdata/issue47837/main/main.go
+lib/go/misc/cgo/testshared/testdata/issue58966/main.go
 lib/go/misc/cgo/testshared/testdata/trivial/trivial.go
 lib/go/misc/cgo/testso/noso_test.go
 lib/go/misc/cgo/testso/overlaydir_test.go
@@ -1897,6 +1898,7 @@ lib/go/src/cmd/go/testdata/script/build_import_comment.txt
 lib/go/src/cmd/go/testdata/script/build_import_cycle.txt
 lib/go/src/cmd/go/testdata/script/build_internal.txt
 lib/go/src/cmd/go/testdata/script/build_issue48319.txt
+lib/go/src/cmd/go/testdata/script/build_issue59571.txt
 lib/go/src/cmd/go/testdata/script/build_issue6480.txt
 lib/go/src/cmd/go/testdata/script/build_link_x_import_path_escape.txt
 lib/go/src/cmd/go/testdata/script/build_multi_main.txt
@@ -1933,6 +1935,7 @@ lib/go/src/cmd/go/testdata/script/cgo_path_space.txt
 lib/go/src/cmd/go/testdata/script/cgo_path.txt
 lib/go/src/cmd/go/testdata/script/cgo_stale_precompiled.txt
 lib/go/src/cmd/go/testdata/script/cgo_stale.txt
+lib/go/src/cmd/go/testdata/script/cgo_suspect_flag_force_external.txt
 lib/go/src/cmd/go/testdata/script/cgo_syso_issue29253.txt
 lib/go/src/cmd/go/testdata/script/cgo_undef.txt
 lib/go/src/cmd/go/testdata/script/chdir.txt
@@ -6871,10 +6874,6 @@ lib/go/src/os/readfrom_stub.go
 lib/go/src/os/removeall_at.go
 lib/go/src/os/removeall_noat.go
 lib/go/src/os/removeall_test.go
-lib/go/src/os/rlimit_darwin.go
-lib/go/src/os/rlimit_stub.go
-lib/go/src/os/rlimit_test.go
-lib/go/src/os/rlimit.go
 lib/go/src/os/signal/doc.go
 lib/go/src/os/signal/example_test.go
 lib/go/src/os/signal/example_unix_test.go
@@ -8233,6 +8232,7 @@ lib/go/src/syscall/exec_windows_test.go
 lib/go/src/syscall/exec_windows.go
 lib/go/src/syscall/export_darwin_test.go
 lib/go/src/syscall/export_linux_test.go
+lib/go/src/syscall/export_rlimit_test.go
 lib/go/src/syscall/export_unix_test.go
 lib/go/src/syscall/export_windows_test.go
 lib/go/src/syscall/flock_aix.go
@@ -8272,6 +8272,10 @@ lib/go/src/syscall/netlink_linux.go
 lib/go/src/syscall/ptrace_darwin.go
 lib/go/src/syscall/ptrace_ios.go
 lib/go/src/syscall/pwd_plan9.go
+lib/go/src/syscall/rlimit_darwin.go
+lib/go/src/syscall/rlimit_stub.go
+lib/go/src/syscall/rlimit_test.go
+lib/go/src/syscall/rlimit.go
 lib/go/src/syscall/route_bsd.go
 lib/go/src/syscall/route_darwin.go
 lib/go/src/syscall/route_dragonfly.go
@@ -11012,10 +11016,16 @@ lib/go/test/fixedbugs/issue58563.go
 lib/go/test/fixedbugs/issue5910.dir/a.go
 lib/go/test/fixedbugs/issue5910.dir/main.go
 lib/go/test/fixedbugs/issue5910.go
+lib/go/test/fixedbugs/issue59293.go
+lib/go/test/fixedbugs/issue59334.go
+lib/go/test/fixedbugs/issue59367.go
+lib/go/test/fixedbugs/issue59378.go
 lib/go/test/fixedbugs/issue5957.dir/a.go
 lib/go/test/fixedbugs/issue5957.dir/b.go
 lib/go/test/fixedbugs/issue5957.dir/c.go
 lib/go/test/fixedbugs/issue5957.go
+lib/go/test/fixedbugs/issue59572.go
+lib/go/test/fixedbugs/issue59572.out
 lib/go/test/fixedbugs/issue5963.go
 lib/go/test/fixedbugs/issue6004.go
 lib/go/test/fixedbugs/issue6036.go
@@ -12155,6 +12165,7 @@ lib/go/VERSION
 @dir lib/go/misc/cgo/testshared/testdata/issue47837/a
 @dir lib/go/misc/cgo/testshared/testdata/issue47837/main
 @dir lib/go/misc/cgo/testshared/testdata/issue47837
+@dir lib/go/misc/cgo/testshared/testdata/issue58966
 @dir lib/go/misc/cgo/testshared/testdata/trivial
 @dir lib/go/misc/cgo/testshared/testdata
 @dir lib/go/misc/cgo/testshared