diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index 9e9ab8ecd1c4..0a11883beb29 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	minecraft-server
-DISTVERSION=	1.21.4
+DISTVERSION=	1.21.5
 CATEGORIES=	games java
-MASTER_SITES=	https://piston-data.mojang.com/v1/objects/4707d00eb834b446575d89a61a11b5d548d8c001/
+MASTER_SITES=	https://piston-data.mojang.com/v1/objects/e6ec2f64e6080b9b5d9b471b291c33cc7f509733/
 DISTNAME=	server
 EXTRACT_SUFX=	.jar
 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
 
 USES=		java
 JAVA_VERSION=	21
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	minecraft-server pkg-deinstall pkg-message
 SUB_LIST=	JAVA_VERSION=${JAVA_VERSION} VERSION=${DISTVERSION}
 
 USERS=		mcserver
 GROUPS=		${USERS}
 
 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 8cee691bbe20..926adddfbe34 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733907511
-SHA256 (minecraft-server-1.21.4/server.jar) = 1066970b09e9c671844572291c4a871cc1ac2b85838bf7004fa0e778e10f1358
-SIZE (minecraft-server-1.21.4/server.jar) = 56880250
+TIMESTAMP = 1744905150
+SHA256 (minecraft-server-1.21.5/server.jar) = ae7681dadce21b6b4017d28e7eb567d86b6c100a6969994f540b9e54f812dc29
+SIZE (minecraft-server-1.21.5/server.jar) = 57269758
diff --git a/games/minecraft-server/pkg-plist b/games/minecraft-server/pkg-plist
index 4e3091451d24..818aea5b1592 100644
--- a/games/minecraft-server/pkg-plist
+++ b/games/minecraft-server/pkg-plist
@@ -1,66 +1,66 @@
 %%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/fasterxml/jackson/core/jackson-annotations/2.13.4/jackson-annotations-2.13.4.jar
 @rmtry minecraft-server/libraries/com/fasterxml/jackson/core/jackson-core/2.13.4/jackson-core-2.13.4.jar
 @rmtry minecraft-server/libraries/com/fasterxml/jackson/core/jackson-databind/2.13.4.2/jackson-databind-2.13.4.2.jar
 @rmtry minecraft-server/libraries/com/github/oshi/oshi-core/6.6.5/oshi-core-6.6.5.jar
 @rmtry minecraft-server/libraries/com/github/stephenc/jcip/jcip-annotations/1.0-1/jcip-annotations-1.0-1.jar
 @rmtry minecraft-server/libraries/com/google/code/gson/gson/2.11.0/gson-2.11.0.jar
 @rmtry minecraft-server/libraries/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.jar
 @rmtry minecraft-server/libraries/com/google/guava/guava/33.3.1-jre/guava-33.3.1-jre.jar
 @rmtry minecraft-server/libraries/com/microsoft/azure/msal4j/1.17.2/msal4j-1.17.2.jar
-@rmtry minecraft-server/libraries/com/mojang/authlib/6.0.57/authlib-6.0.57.jar
+@rmtry minecraft-server/libraries/com/mojang/authlib/6.0.58/authlib-6.0.58.jar
 @rmtry minecraft-server/libraries/com/mojang/brigadier/1.3.10/brigadier-1.3.10.jar
 @rmtry minecraft-server/libraries/com/mojang/datafixerupper/8.0.16/datafixerupper-8.0.16.jar
 @rmtry minecraft-server/libraries/com/mojang/jtracy/1.0.29/jtracy-1.0.29.jar
 @rmtry minecraft-server/libraries/com/mojang/logging/1.5.10/logging-1.5.10.jar
 @rmtry minecraft-server/libraries/com/nimbusds/content-type/2.3/content-type-2.3.jar
 @rmtry minecraft-server/libraries/com/nimbusds/lang-tag/1.7/lang-tag-1.7.jar
 @rmtry minecraft-server/libraries/com/nimbusds/nimbus-jose-jwt/9.40/nimbus-jose-jwt-9.40.jar
 @rmtry minecraft-server/libraries/com/nimbusds/oauth2-oidc-sdk/11.18/oauth2-oidc-sdk-11.18.jar
 @rmtry minecraft-server/libraries/commons-io/commons-io/2.17.0/commons-io-2.17.0.jar
-@rmtry minecraft-server/libraries/io/netty/netty-buffer/4.1.115.Final/netty-buffer-4.1.115.Final.jar
-@rmtry minecraft-server/libraries/io/netty/netty-codec/4.1.115.Final/netty-codec-4.1.115.Final.jar
-@rmtry minecraft-server/libraries/io/netty/netty-common/4.1.115.Final/netty-common-4.1.115.Final.jar
-@rmtry minecraft-server/libraries/io/netty/netty-handler/4.1.115.Final/netty-handler-4.1.115.Final.jar
-@rmtry minecraft-server/libraries/io/netty/netty-resolver/4.1.115.Final/netty-resolver-4.1.115.Final.jar
-@rmtry minecraft-server/libraries/io/netty/netty-transport/4.1.115.Final/netty-transport-4.1.115.Final.jar
-@rmtry minecraft-server/libraries/io/netty/netty-transport-classes-epoll/4.1.115.Final/netty-transport-classes-epoll-4.1.115.Final.jar
-@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.115.Final/netty-transport-native-epoll-4.1.115.Final-linux-aarch_64.jar
-@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.115.Final/netty-transport-native-epoll-4.1.115.Final-linux-x86_64.jar
-@rmtry minecraft-server/libraries/io/netty/netty-transport-native-unix-common/4.1.115.Final/netty-transport-native-unix-common-4.1.115.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-buffer/4.1.118.Final/netty-buffer-4.1.118.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-codec/4.1.118.Final/netty-codec-4.1.118.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-common/4.1.118.Final/netty-common-4.1.118.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-handler/4.1.118.Final/netty-handler-4.1.118.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-resolver/4.1.118.Final/netty-resolver-4.1.118.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-transport/4.1.118.Final/netty-transport-4.1.118.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-transport-classes-epoll/4.1.118.Final/netty-transport-classes-epoll-4.1.118.Final.jar
+@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.118.Final/netty-transport-native-epoll-4.1.118.Final-linux-aarch_64.jar
+@rmtry minecraft-server/libraries/io/netty/netty-transport-native-epoll/4.1.118.Final/netty-transport-native-epoll-4.1.118.Final-linux-x86_64.jar
+@rmtry minecraft-server/libraries/io/netty/netty-transport-native-unix-common/4.1.118.Final/netty-transport-native-unix-common-4.1.118.Final.jar
 @rmtry minecraft-server/libraries/it/unimi/dsi/fastutil/8.5.15/fastutil-8.5.15.jar
 @rmtry minecraft-server/libraries/net/java/dev/jna/jna/5.15.0/jna-5.15.0.jar
 @rmtry minecraft-server/libraries/net/java/dev/jna/jna-platform/5.15.0/jna-platform-5.15.0.jar
 @rmtry minecraft-server/libraries/net/minidev/accessors-smart/2.5.1/accessors-smart-2.5.1.jar
 @rmtry minecraft-server/libraries/net/minidev/json-smart/2.5.1/json-smart-2.5.1.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.17.0/commons-lang3-3.17.0.jar
 @rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-api/2.24.1/log4j-api-2.24.1.jar
 @rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-core/2.24.1/log4j-core-2.24.1.jar
 @rmtry minecraft-server/libraries/org/apache/logging/log4j/log4j-slf4j2-impl/2.24.1/log4j-slf4j2-impl-2.24.1.jar
 @rmtry minecraft-server/libraries/org/joml/joml/1.10.8/joml-1.10.8.jar
 @rmtry minecraft-server/libraries/org/lz4/lz4-java/1.8.0/lz4-java-1.8.0.jar
 @rmtry minecraft-server/libraries/org/ow2/asm/asm/9.6/asm-9.6.jar
 @rmtry minecraft-server/libraries/org/slf4j/slf4j-api/2.0.16/slf4j-api-2.0.16.jar
 @rmtry minecraft-server/versions/%%VERSION%%/server-%%VERSION%%.jar
 @owner
 @group