diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index c709fe3e1c27..8a4d0e6e0432 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	minecraft-server
-DISTVERSION=	1.20.6
+DISTVERSION=	1.21
 CATEGORIES=	games java
-MASTER_SITES=	https://piston-data.mojang.com/v1/objects/145ff0858209bcfc164859ba735d4199aafa1eea/
+MASTER_SITES=	https://piston-data.mojang.com/v1/objects/450698d1863ab5180c25d7c804ef0fe6369dd1ba/
 DISTNAME=	server
 EXTRACT_SUFX=	.jar
-DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
+DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	freebsd@jonathanprice.org
 COMMENT=	Dedicated server for the game Minecraft
 WWW=		http://www.minecraft.net/
 
 LICENSE=	minecraft
 LICENSE_NAME=	Minecraft End User License Agreement
 LICENSE_TEXT=	The license can be viewed at: https://account.mojang.com/documents/minecraft_eula
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 USE_JAVA=	yes
 JAVA_VERSION=	21
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	minecraft-server pkg-deinstall pkg-message
-SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} VERSION=${PORTVERSION}
+SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} VERSION=${DISTVERSION}
 
 USERS=		mcserver
 GROUPS=		${USERS}
 
-PLIST_SUB=	VERSION=${PORTVERSION}
+PLIST_SUB=	VERSION=${DISTVERSION}
 
 CONFIG_FILES=	banned-ips.json banned-players.json eula.txt ops.json \
 		server.properties usercache.json whitelist.json
 
 OPTIONS_DEFAULT=	STANDALONE
 OPTIONS_SINGLE=		RUN
 OPTIONS_SINGLE_RUN=	DAEMON STANDALONE
 OPTIONS_SUB=		yes
 
 DAEMON_DESC=		Run as a service
 STANDALONE_DESC=	Run the .jar file directly
 DAEMON_RUN_DEPENDS=	tmux:sysutils/tmux
 DAEMON_VARS=		USE_RC_SUBR=minecraft
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} \
 		${STAGEDIR}${PREFIX}/${PORTNAME}
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}/var/db/minecraft-server
 	${MKDIR} ${STAGEDIR}/var/log/minecraft-server
 	${MKDIR} ${STAGEDIR}/var/log/minecraft-server/debug
 .for file in ${CONFIG_FILES}
 	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
 .endfor
 	${LN} -sf /var/db/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/world
 	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/logs
 	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${PREFIX}/${PORTNAME}/debug
 
 post-install-STANDALONE-on:
 	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-server \
 		${STAGEDIR}${PREFIX}/bin
 	${CP} ${FILESDIR}/java-args.txt ${STAGEDIR}${ETCDIR}
 
 .include <bsd.port.mk>
diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo
index eda4c31b11d3..e16c583ca9cb 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1716300294
-SHA256 (minecraft-server-1.20.6/server.jar) = c6d01d018ca782e506f0ec60652d47fd565078be9122b625c1681bc86c29c7ec
-SIZE (minecraft-server-1.20.6/server.jar) = 51420480
+TIMESTAMP = 1718473623
+SHA256 (minecraft-server-1.21/server.jar) = c96394da86f9d9f9ef7ca2d2ee1f2f0980c29b7aa5c94b43c02c50435dbcf53f
+SIZE (minecraft-server-1.21/server.jar) = 51623779
diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist
index 1782fab03eda..2393dbd63bad 100644
--- a/games/minecraft-server/pkg-plist
+++ b/games/minecraft-server/pkg-plist
@@ -1,53 +1,53 @@
 %%STANDALONE%%bin/minecraft-server
 @owner mcserver
 @group mcserver
 %%STANDALONE%%%%ETCDIR%%/java-args.txt
 minecraft-server/banned-ips.json
 minecraft-server/banned-players.json
 minecraft-server/debug
 minecraft-server/eula.txt
 minecraft-server/logs
 minecraft-server/server.jar
 minecraft-server/ops.json
 minecraft-server/server.properties
 minecraft-server/usercache.json
 minecraft-server/whitelist.json
 minecraft-server/world
 @dir %%ETCDIR%%
 @dir minecraft-server
 @dir /var/db/minecraft-server
 @dir /var/log/minecraft-server
 @dir /var/log/minecraft-server/debug
 @rmtry minecraft-server/libraries/com/github/oshi/oshi-core/6.4.10/oshi-core-6.4.10.jar
 @rmtry minecraft-server/libraries/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar
 @rmtry minecraft-server/libraries/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar
 @rmtry minecraft-server/libraries/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar
 @rmtry minecraft-server/libraries/com/mojang/authlib/6.0.54/authlib-6.0.54.jar
 @rmtry minecraft-server/libraries/com/mojang/brigadier/1.2.9/brigadier-1.2.9.jar
-@rmtry minecraft-server/libraries/com/mojang/datafixerupper/7.0.14/datafixerupper-7.0.14.jar
+@rmtry minecraft-server/libraries/com/mojang/datafixerupper/8.0.16/datafixerupper-8.0.16.jar
 @rmtry minecraft-server/libraries/com/mojang/logging/1.2.7/logging-1.2.7.jar
 @rmtry minecraft-server/libraries/commons-io/commons-io/2.15.1/commons-io-2.15.1.jar
 @rmtry minecraft-server/libraries/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/io/netty/netty-codec/4.1.97.Final/netty-codec-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/io/netty/netty-common/4.1.97.Final/netty-common-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/io/netty/netty-handler/4.1.97.Final/netty-handler-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/io/netty/netty-resolver/4.1.97.Final/netty-resolver-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/io/netty/netty-transport/4.1.97.Final/netty-transport-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/io/netty/netty-transport-classes-epoll/4.1.97.Final/netty-transport-classes-epoll-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-aarch_64.jar
 @rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final-linux-x86_64.jar
 @rmtry minecraft-server/libraries/io/netty/netty-transport-native-unix-common/4.1.97.Final/netty-transport-native-unix-common-4.1.97.Final.jar
 @rmtry minecraft-server/libraries/it/unimi/dsi/fastutil/8.5.12/fastutil-8.5.12.jar
 @rmtry minecraft-server/libraries/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar
 @rmtry minecraft-server/libraries/net/java/dev/jna/jna-platform/5.14.0/jna-platform-5.14.0.jar
 @rmtry minecraft-server/libraries/net/sf/jopt-simple/jopt-simple/5.0.4/jopt-simple-5.0.4.jar
 @rmtry minecraft-server/libraries/org/apache/commons/commons-lang3/3.14.0/commons-lang3-3.14.0.jar
 @rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-api/2.22.1/log4j-api-2.22.1.jar
 @rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-core/2.22.1/log4j-core-2.22.1.jar
 @rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.22.1/log4j-slf4j2-impl-2.22.1.jar
 @rmtry minecraft-server/libraries/org/joml/joml/1.10.5/joml-1.10.5.jar
 @rmtry minecraft-server/libraries/org/slf4j/slf4j-api/2.0.9/slf4j-api-2.0.9.jar
 @rmtry minecraft-server/libraries/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar
-@rmtry minecraft-server/versions/1.20.6/server-1.20.6.jar
+@rmtry minecraft-server/versions/%%VERSION%%/server-%%VERSION%%.jar
 @owner
 @group