diff --git a/lang/go121/Makefile b/lang/go121/Makefile
index ae8a80b696f3..9ca849394338 100644
--- a/lang/go121/Makefile
+++ b/lang/go121/Makefile
@@ -1,20 +1,20 @@
-DISTVERSION=	1.21.5
+DISTVERSION=	1.21.7
 # Always set PORTREVISION explicitly as otherwise they are inherited from lang/go-devel
 PORTREVISION=	0
 MASTER_SITES=	https://golang.org/dl/ \
 		https://github.com/dmgk/go-bootstrap/releases/download/${BOOTSTRAP_TAG}/:bootstrap \
 		LOCAL/dmgk:bootstrap
 DISTFILES=	go${DISTVERSION}.src.tar.gz \
 		go-${OPSYS:tl}-${GOARCH_${ARCH}}${GOARM_${ARCH}}-${BOOTSTRAP_TAG}.tar.xz:bootstrap
 
 # Avoid conflicting patch files
 PATCHFILES=
 
 COMMENT=	Go programming language
 
 MASTERDIR=	${.CURDIR}/../go-devel
 PATCHDIR=	${.CURDIR}/files
 WRKSRC=		${WRKDIR}/go
 DISTINFO_FILE=	${.CURDIR}/distinfo
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/go121/distinfo b/lang/go121/distinfo
index 815b92dd51f1..c8418b80efba 100644
--- a/lang/go121/distinfo
+++ b/lang/go121/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1701913578
-SHA256 (go1.21.5.src.tar.gz) = 285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19
-SIZE (go1.21.5.src.tar.gz) = 26986890
+TIMESTAMP = 1707250550
+SHA256 (go1.21.7.src.tar.gz) = 00197ab20f33813832bff62fd93cca1c42a08cc689a32a6672ca49591959bff6
+SIZE (go1.21.7.src.tar.gz) = 26991014
 SHA256 (go-freebsd-arm64-go1.20.tar.xz) = 674e0a9bce8b64dcc085b000eb83ae880e96be1ee47dad6ec86c82dbe5550623
 SIZE (go-freebsd-arm64-go1.20.tar.xz) = 32640640
 SHA256 (go-freebsd-amd64-go1.20.tar.xz) = 170f612c4b8a59400f27d642aab37afa831fe2d6df3e7473dec2d4574a59a46c
 SIZE (go-freebsd-amd64-go1.20.tar.xz) = 34684360
 SHA256 (go-freebsd-arm6-go1.20.tar.xz) = acf99dbb285c6d2b80e0abfe4bffd0d230516ea84d17be0d5bc1045809e3d33a
 SIZE (go-freebsd-arm6-go1.20.tar.xz) = 33418476
 SHA256 (go-freebsd-arm7-go1.20.tar.xz) = 12dd61c802eada70380f0b4755656d82dbf228575c056775c682456380be5039
 SIZE (go-freebsd-arm7-go1.20.tar.xz) = 33346596
 SHA256 (go-freebsd-386-go1.20.tar.xz) = 34e888a37153270b33503a23885ea4c85ba4bd09849d2c937fc9d312c0f49983
 SIZE (go-freebsd-386-go1.20.tar.xz) = 35448892
 SHA256 (go-freebsd-riscv64-go1.20.tar.xz) = 010921013d24124ff31f4b1965456349547acf936572fc6e0bcf95a0542794bd
 SIZE (go-freebsd-riscv64-go1.20.tar.xz) = 33807544