diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 0aeeb6dd260ed..cd6225a60bfaa 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1 +1 @@
-DIST minecraft-server-1.21.4.jar 56880250 BLAKE2B 4690780542d0fd91a67a7edad7b8d71a1b67249cfe810f065f8c0a2ede07fea0c7efed2f51cc1c368e2526039376485d61864d8ac4b72ffbb03f716d86e56a4f SHA512 f8a1c1b6f2ca9f6960e71abddbd994930d710a75711e9ea3b6f148ffa5cc0d94350d728379a5811f7796c9825b846f578d01bdc0f5f421ae13abdcfd504ff366
+DIST minecraft-server-1.21.5.jar 57269758 BLAKE2B b6f4f6fc8681a25f03b260c3caff4cc5f2dc2e64192575894d7d1771f0c9c0cb0bfe01e023c9df6967d70f50a3d6baafd730ab1bc1cd78f89b30d735106ea47b SHA512 735a2051525ad282b912200d2d3c2edd8e4585d0ee82a4db88b05fd9ed9ed13b9467c7f4b8e42b60c45bb308f92ac3ea3b6cff888fa3ce950a1b71d8231b7026
diff --git a/games-server/minecraft-server/minecraft-server-1.21.4.ebuild b/games-server/minecraft-server/minecraft-server-1.21.5.ebuild
similarity index 92%
rename from games-server/minecraft-server/minecraft-server-1.21.4.ebuild
rename to games-server/minecraft-server/minecraft-server-1.21.5.ebuild
index fd12f3e3f21f9..7b0640e33aaf3 100644
--- a/games-server/minecraft-server/minecraft-server-1.21.4.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.21.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-EGIT_COMMIT="4707d00eb834b446575d89a61a11b5d548d8c001"
+EGIT_COMMIT="e6ec2f64e6080b9b5d9b471b291c33cc7f509733"
 README_GENTOO_SUFFIX="-r1"
 
 inherit readme.gentoo-r1 java-pkg-2 systemd