diff --git a/games/minetest/Makefile b/games/minetest/Makefile
index 6442229f809f..ef3f07020b16 100644
--- a/games/minetest/Makefile
+++ b/games/minetest/Makefile
@@ -1,116 +1,115 @@
 PORTNAME=	minetest
-PORTVERSION=	5.4.0
-PORTREVISION=	1
+PORTVERSION=	5.4.1
 CATEGORIES=	games
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Near-infinite-world block sandbox game
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/doc/lgpl-2.1.txt
 
 LIB_DEPENDS=	libsqlite3.so:databases/sqlite3 \
 		libgmp.so:math/gmp \
 		libjsoncpp.so:devel/jsoncpp
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	minetest
 
 USES=		cmake compiler:c11 iconv:wchar_t
 CMAKE_ARGS=	-DCUSTOM_MANDIR="${PREFIX}/man" \
 		-DCUSTOM_EXAMPLE_CONF_DIR="${PREFIX}/etc" \
 		-DENABLE_SYSTEM_JSONCPP=ON
 
 LDFLAGS_i386=	-Wl,-znotext
 
 PORTDATA=	*
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	CURL SOUND FREETYPE NCURSES LUAJIT \
 		DOCS EXAMPLES NLS
 OPTIONS_MULTI=	COMP
 OPTIONS_GROUP=	DATABASE
 
 COMP_DESC=		Software components
 OPTIONS_MULTI_COMP=	CLIENT SERVER
 
 DATABASE_DESC=		Database support
 OPTIONS_GROUP_DATABASE=	PGSQL LEVELDB REDIS SPATIAL
 
 OPTIONS_DEFAULT=	CLIENT SERVER \
 			CURL SOUND FREETYPE NCURSES LUAJIT
 OPTIONS_SUB=		yes
 
 CLIENT_DESC=		Build client
 CLIENT_CMAKE_BOOL=	BUILD_CLIENT
 CLIENT_LIB_DEPENDS=	libpng.so:graphics/png \
 			libIrrlicht.so:x11-toolkits/irrlicht
 CLIENT_USES=		gl jpeg xorg
 CLIENT_USE=		GL=gl XORG=x11,xext,xxf86vm
 SERVER_DESC=		Build server
 SERVER_CMAKE_BOOL=	BUILD_SERVER
 
 CURL_DESC=		Enable cURL support for fetching media
 CURL_CMAKE_BOOL=	ENABLE_CURL
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 SOUND_DESC=		Enable sound
 SOUND_CMAKE_BOOL=	ENABLE_SOUND
 FREETYPE_DESC=		Support for TrueType fonts with unicode
 FREETYPE_CMAKE_BOOL=	ENABLE_FREETYPE
 FREETYPE_LIB_DEPENDS=	libfreetype.so:print/freetype2
 NCURSES_DESC=		Enable ncurses console
 NCURSES_CMAKE_BOOL=	ENABLE_CURSES
 NCURSES_USES=		ncurses
 
 LUAJIT_DESC=		LuaJIT support
 LUAJIT_CMAKE_BOOL=	ENABLE_LUAJIT REQUIRE_LUAJIT
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit-openresty
 
 PGSQL_USES=		pgsql
 PGSQL_CMAKE_BOOL=	ENABLE_POSTGRESQL
 LEVELDB_DESC=		Enable LevelDB backend
 LEVELDB_CMAKE_BOOL=	ENABLE_LEVELDB
 LEVELDB_LIB_DEPENDS=	libleveldb.so:databases/leveldb
 REDIS_DESC=		Enable Redis backend
 REDIS_CMAKE_BOOL=	ENABLE_REDIS
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
 SPATIAL_DESC=		Enable SpatialIndex AreaStore backend
 SPATIAL_LIB_DEPENDS=	libspatialindex.so:devel/spatialindex
 SPATIAL_CMAKE_BOOL=	ENABLE_SPATIAL
 
 NLS_CMAKE_BOOL=		ENABLE_GETTEXT
 NLS_USES=		gettext
 NLS_LDFLAGS=		-L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSOUND}
 USES+=		openal
 LIB_DEPENDS+=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg
 .endif
 
 .if ${PORT_OPTIONS:MSERVER}
 USE_RC_SUBR=	${PORTNAME}
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 .endif
 
 # hacky way to not bring irrlicht and X11 depends for server only
 .if ! ${PORT_OPTIONS:MCLIENT} && ${PORT_OPTIONS:MSERVER}
 BUILD_DEPENDS+=	${NONEXISTENT}:x11-toolkits/irrlicht:patch
 IRRLICHT_INCLUDE_DIR=	`${MAKE} -C ${PORTSDIR}/x11-toolkits/irrlicht -V WRKSRC`/include
 CMAKE_ARGS+=	-DIRRLICHT_INCLUDE_DIR:STRING="${IRRLICHT_INCLUDE_DIR}"
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-irrlichtdepend
 .endif
 
 post-extract:
 # make sure no bundled gmp is used
 	@${RM} -rf ${WRKSRC}/lib/gmp ${WRKSRC}/lib/jsoncpp
 # bundled lua is OK, there's no option to use system one
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/*.cmake
 
 .include <bsd.port.mk>
diff --git a/games/minetest/distinfo b/games/minetest/distinfo
index 59dd2b394f18..f2e09c07a58f 100644
--- a/games/minetest/distinfo
+++ b/games/minetest/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614611624
-SHA256 (minetest-minetest-5.4.0_GH0.tar.gz) = 6e9b299e156651be9bcf973a9232cff32215de31dfae5ea770a71d1757cab014
-SIZE (minetest-minetest-5.4.0_GH0.tar.gz) = 11205196
+TIMESTAMP = 1618146422
+SHA256 (minetest-minetest-5.4.1_GH0.tar.gz) = de9e4410583c845c104b4be25f9d0b8743d8573c120149b8910ae2519f9ab14e
+SIZE (minetest-minetest-5.4.1_GH0.tar.gz) = 11209289
diff --git a/games/minetest/files/patch-src_CMakeLists.txt b/games/minetest/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 3f56c7ea83fb..000000000000
--- a/games/minetest/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/CMakeLists.txt.orig	2020-07-09 20:04:20 UTC
-+++ src/CMakeLists.txt
-@@ -517,9 +517,13 @@ if (CMAKE_VERSION VERSION_GREATER 3.8.1)
- 	source_group(TREE ${PROJECT_SOURCE_DIR} PREFIX "Source Files" FILES ${server_SRCS})
- endif()
- 
--include_directories(
-+include_directories(BEFORE
- 	${PROJECT_BINARY_DIR}
- 	${PROJECT_SOURCE_DIR}
-+	${PROJECT_SOURCE_DIR}/script
-+)
-+
-+include_directories(
- 	${IRRLICHT_INCLUDE_DIR}
- 	${ZLIB_INCLUDE_DIR}
- 	${PNG_INCLUDE_DIR}
-@@ -529,7 +533,6 @@ include_directories(
- 	${GMP_INCLUDE_DIR}
- 	${JSON_INCLUDE_DIR}
- 	${X11_INCLUDE_DIR}
--	${PROJECT_SOURCE_DIR}/script
- )
- 
- if(USE_GETTEXT)