diff --git a/games/scummvm-tools/Makefile b/games/scummvm-tools/Makefile
index 3dccffb3d04b..269d642c1eb8 100644
--- a/games/scummvm-tools/Makefile
+++ b/games/scummvm-tools/Makefile
@@ -1,58 +1,58 @@
 # Created by: Adam Weinberger <adamw@FreeBSD.org>
 
 PORTNAME=	scummvm-tools
-PORTVERSION=	2.2.0
+PORTVERSION=	2.5.0
 CATEGORIES=	games emulators
 MASTER_SITES=	https://downloads.scummvm.org/frs/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	kai@FreeBSD.org
 COMMENT=	Tools for use with the SCUMMVM game emulator
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	lame:audio/lame \
 		flac:audio/flac \
 		oggenc:audio/vorbis-tools
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libpng.so:graphics/png \
 		libmad.so:audio/libmad \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis \
 		libfreetype.so:print/freetype2
 
 USES=		compiler:c++11-lang gmake iconv pkgconfig tar:bzip2
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--prefix="${PREFIX}" --enable-verbose-build
 
 DESKTOP_ENTRIES="ScummVM Tools" \
 		"" \
 		"${DATADIR}/scummvmtools_128.png" \
 		"${PORTNAME}" \
 		"Utility;Compression;" \
 		false
 
 PORTDOCS=	COPYRIGHT NEWS README TODO
 
 OPTIONS_DEFINE=	WXGTK DOCS
 OPTIONS_DEFAULT=WXGTK
 OPTIONS_SUB=	yes
 
 WXGTK_USE=	WX=2.8
 WXGTK_VARS=	WX_COMP=wx:lib:build WX_CONFIG_ARGS=absolute
 WXGTK_CONFIGURE_ENABLE=	wxwidgets
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|^\(_wxconfig=\).*|\1${WX_CONFIG:C/.*\///}|' \
 		${WRKSRC}/configure
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/games/scummvm-tools/distinfo b/games/scummvm-tools/distinfo
index 8119c7359a74..af1d4700fef8 100644
--- a/games/scummvm-tools/distinfo
+++ b/games/scummvm-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1608282753
-SHA256 (scummvm-tools-2.2.0.tar.bz2) = 62d9549601d314e56079e1698970661d1012bb721b317350545b08c5e95ea3fb
-SIZE (scummvm-tools-2.2.0.tar.bz2) = 846277
+TIMESTAMP = 1633268823
+SHA256 (scummvm-tools-2.5.0.tar.bz2) = 6b81713e9f71a86617e35d927512c8ddfc6fafc33ef6e9e3ede50fb681456fcf
+SIZE (scummvm-tools-2.5.0.tar.bz2) = 1426776
diff --git a/games/scummvm-tools/files/patch-configure b/games/scummvm-tools/files/patch-configure
index bf54bab85942..87c96e205bde 100644
--- a/games/scummvm-tools/files/patch-configure
+++ b/games/scummvm-tools/files/patch-configure
@@ -1,22 +1,15 @@
---- configure.orig	2020-07-13 19:08:26 UTC
+--- configure.orig	2021-10-03 21:07:57 UTC
 +++ configure
-@@ -1672,16 +1672,12 @@ if test "$_wxwidgets" = auto ; then
+@@ -1836,9 +1836,9 @@ if test "$_wxwidgets" = auto ; then
  fi
  
  if test "$_wxwidgets" = yes ; then
 -	_wxincludes="`$_wxconfig --prefix="$_wxpath" --cflags`"
 -	_wxlibs="`$_wxconfig --prefix="$_wxpath" --libs`"
 -	_wxstaticlibs="`$_wxconfig --prefix="$_wxpath" --static --libs 2> /dev/null`"
 +	_wxincludes="`$_wxconfig --cflags`"
 +	_wxlibs="`$_wxconfig --libs`"
 +	_wxstaticlibs="`$_wxconfig --static --libs 2> /dev/null`"
  	_wxstaticlibs=`echo $_wxstaticlibs | sed 's|-lpng||' | sed 's|-lz||'`
  	# _wxstaticlibs may contain non-static libraries that we also have in _wxstaticlibs.
  	# remove those to avoid dependency on non-static libraries
--
--	# Use the compiler specified by wx-config. This is needed on some systems to get a working executable.
--	CXX="`$_wxconfig --cxx`"
--	LD=$CXX
- 
- echo_n "Checking for wxwidgets gui dev component... "
- 	has_wx_gui_dev=no
diff --git a/games/scummvm-tools/pkg-plist b/games/scummvm-tools/pkg-plist
index 472b134bac54..03a40727affa 100644
--- a/games/scummvm-tools/pkg-plist
+++ b/games/scummvm-tools/pkg-plist
@@ -1,19 +1,26 @@
 bin/construct_mohawk
 bin/create_sjisfnt
 bin/decine
 bin/decompile
 bin/degob
 bin/dekyra
 bin/deprince
 bin/descumm
 bin/desword2
+bin/extract_gob_cdi
+bin/extract_hadesch
+bin/extract_lokalizator
 bin/extract_mohawk
+bin/extract_ngi
 bin/gob_loadcalc
+bin/msn_convert_mod
 %%WXGTK%%bin/scummvm-tools
 bin/scummvm-tools-cli
 %%DATADIR%%/detaillogo.jpg
 %%DATADIR%%/logo.jpg
+%%DATADIR%%/scummvm-tools.info
+%%DATADIR%%/scummvm-tools_drawer.info
 %%DATADIR%%/scummvmtools.icns
 %%DATADIR%%/scummvmtools.ico
 %%DATADIR%%/scummvmtools_128.png
 %%DATADIR%%/tile.gif