diff --git a/games-server/minecraft-server/Manifest b/games-server/minecraft-server/Manifest
index 9cb93ac..30bc41c 100644
--- a/games-server/minecraft-server/Manifest
+++ b/games-server/minecraft-server/Manifest
@@ -1,2 +1 @@
-DIST minecraft-server-1.16.3.jar 37942656 BLAKE2B 1ed70ac476dd202797f46a4844519d816f17c272d0703791d74b651fa8ac4c343a6939b50c5a0230d5bf149a564af6c7603297f0b114ce9fd2487f4bebef1c7e SHA512 ef9956ec55638b54e21e3b504ba2d2ce1b9d09769b5e118a36fbf2d97bd84a5bb49adf9a07328ae3e1c9fd76fe3da0b7d56baaa77bdc55b99d0f45039ada2ac3
-DIST minecraft-server-1.16.4.jar 37961464 BLAKE2B 1578a1ad52c81c038a1a5ee63b68dba03ff54005991095bde9d88a9275b427dc86144e26466dc2ad0313740f387fafd7c23cbdf61c452fff8df4ca82ec6367b5 SHA512 2807168800da30e6e58a22fc9f1981b58be6ba986d12dc138c19013269fcf51976db21a0488c3a95468e4f8016646db3a9966ac2065f6950ba9b733056df47bd
+DIST minecraft-server-1.17.0.jar 43621201 BLAKE2B f92b43e33e17e0cdada880e969ff05cdf79af7ff96c2e8043010bfff303ffad702fa9aa3cd8247e6092e64f4ba87562c458d95e38b26f7e52306fefbe5b2c30b SHA512 d8c7658f2fedeb0ce60be24935e5543135200feae53bcaec510fcb86b93a18ac3464527a4d657c886f5ecaca89f1a7701cb03d6656efcb5c19e2156e59feef5a
diff --git a/games-server/minecraft-server/minecraft-server-1.16.3.ebuild b/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
deleted file mode 100644
index c32f012..0000000
--- a/games-server/minecraft-server/minecraft-server-1.16.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-EGIT_COMMIT="f02f4473dbf152c23d7d484952121db0b36698cb"
-README_GENTOO_SUFFIX="-r1"
-
-inherit readme.gentoo-r1 java-pkg-2
-
-DESCRIPTION="The official server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://launcher.mojang.com/v1/objects/${EGIT_COMMIT}/server.jar -> ${P}.jar"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	acct-group/minecraft
-	acct-user/minecraft
-	app-misc/dtach
-	|| (
-		>=virtual/jre-1.8
-		>=virtual/jdk-1.8
-	)
-"
-
-RESTRICT="bindist mirror"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	cp "${DISTDIR}/${A}" "${WORKDIR}" || die
-}
-
-src_install() {
-	java-pkg_newjar minecraft-server-${PV}.jar minecraft-server.jar
-	java-pkg_dolauncher minecraft-server --jar minecraft-server.jar --java_args "\${JAVA_OPTS}"
-
-	newinitd "${FILESDIR}"/minecraft-server.initd-r4 minecraft-server
-	newconfd "${FILESDIR}"/minecraft-server.confd-r1 minecraft-server
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/games-server/minecraft-server/minecraft-server-1.16.4.ebuild b/games-server/minecraft-server/minecraft-server-1.17.0.ebuild
similarity index 92%
rename from games-server/minecraft-server/minecraft-server-1.16.4.ebuild
rename to games-server/minecraft-server/minecraft-server-1.17.0.ebuild
index a8f5432..4eb5c36 100644
--- a/games-server/minecraft-server/minecraft-server-1.16.4.ebuild
+++ b/games-server/minecraft-server/minecraft-server-1.17.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-EGIT_COMMIT="35139deedbd5182953cf1caa23835da59ca3d7cd"
+EGIT_COMMIT="0a269b5f2c5b93b1712d0f5dc43b6182b9ab254e"
 README_GENTOO_SUFFIX="-r1"
 
 inherit readme.gentoo-r1 java-pkg-2 systemd