diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index 223061024197..0b460fc84244 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -1,69 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	minecraft-server
-PORTVERSION=	1.16.1
+PORTVERSION=	1.16.3
 CATEGORIES=	games java
-MASTER_SITES=	https://launcher.mojang.com/v1/objects/a412fd69db1f81db3f511c1463fd304675244077/
-DISTFILES=	server.jar
+MASTER_SITES=	https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/
+DISTNAME=	server
+EXTRACT_SUFX=	.jar
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 EXTRACT_ONLY=
 
 MAINTAINER=	freebsd@jonathanprice.org
 COMMENT=	Dedicated server for the game Minecraft
 
 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
 
 OPTIONS_SINGLE=		RUN
 OPTIONS_SINGLE_RUN=	DAEMON STANDALONE
 
 DAEMON_DESC=		Run as a service
 STANDALONE_DESC=	Run the .jar file directly
 OPTIONS_SUB=		yes
 
 OPTIONS_DEFAULT=	STANDALONE
 
 USERS=		mcserver
 GROUPS=		${USERS}
 
 NO_BUILD=	yes
 USE_JAVA=	yes
-SUB_FILES=	minecraft-server \
-		pkg-message \
-		pkg-deinstall
+SUB_FILES=	minecraft-server pkg-deinstall pkg-message
 SUB_LIST=	VERSION=${PORTVERSION}
 PLIST_SUB=	VERSION=${PORTVERSION}
 
-CONFIG_FILES=	banned-ips.json \
-		banned-players.json \
-		eula.txt \
-		ops.json \
-		server.properties \
-		usercache.json \
-		whitelist.json
+CONFIG_FILES=	banned-ips.json banned-players.json eula.txt ops.json \
+		server.properties usercache.json whitelist.json
 
-DAEMON_VARS=	USE_RC_SUBR=minecraft
+DAEMON_VARS=		USE_RC_SUBR=minecraft
 DAEMON_RUN_DEPENDS=	tmux:sysutils/tmux
 
 NO_ARCH=	yes
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${PORTNAME}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES} ${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
 .for file in ${CONFIG_FILES}
 	${LN} -s ${ETCDIR}/${file} ${STAGEDIR}${PREFIX}/${PORTNAME}/${file}
 .endfor
 	${LN} -sf /var/log/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/logs
 	${LN} -sf /var/log/minecraft-server/debug ${STAGEDIR}${PREFIX}/${PORTNAME}/debug
 	${LN} -sf /var/db/minecraft-server ${STAGEDIR}${PREFIX}/${PORTNAME}/world
 
 post-install-STANDALONE-on:
-	${INSTALL_SCRIPT} ${WRKDIR}/minecraft-server ${STAGEDIR}${PREFIX}/bin
+	${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 f467e35f2701..0687b8cdbfa0 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595102862
-SHA256 (minecraft-server-1.16.1/server.jar) = 2782d547724bc3ffc0ef6e97b2790e75c1df89241f9d4645b58c706f5e6c935b
-SIZE (minecraft-server-1.16.1/server.jar) = 37968964
+TIMESTAMP = 1599911789
+SHA256 (minecraft-server-1.16.3/server.jar) = 32e450e74c081aec06dcfbadfa5ba9aa1c7f370bd869e658caec0c3004f7ad5b
+SIZE (minecraft-server-1.16.3/server.jar) = 37942656