diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index ba0bf5d8d902..552393743618 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,90 +1,90 @@
 PORTNAME=	mkvtoolnix
-PORTVERSION=	84.0
+PORTVERSION=	85.0
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://www.bunkus.org/videotools/mkvtoolnix/sources/ \
 		https://mkvtoolnix.download/sources/
 
 MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Tools to extract from/get info about/create Matroska media streams
 WWW=		https://www.bunkus.org/videotools/mkvtoolnix/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	rake:devel/rubygem-rake \
 		docbook-xsl>=0:textproc/docbook-xsl \
 		xsltproc:textproc/libxslt
 LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
 		libogg.so:audio/libogg \
 		libebml.so:textproc/libebml \
 		libboost_system.so:devel/boost-libs \
 		libpugixml.so:textproc/pugixml \
 		libmatroska.so:multimedia/libmatroska \
 		libcmark.so:textproc/cmark \
 		libgmp.so:math/gmp
 
 FLAVORS=	qt6 nogui
 FLAVOR?=	${FLAVORS:[1]}
 nogui_PKGNAMESUFFIX=	-nogui
 nogui_CONFLICTS_INSTALL=mkvtoolnix
 qt6_CONFLICTS_INSTALL=	mkvtoolnix-nogui
 
 USES=		${_USES_${FLAVOR}}
 USE_GL=		${_USE_GL_${FLAVOR}}
 USE_QT=		${_USE_QT_${FLAVOR}}
 
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-boost=${LOCALBASE} \
 		--with-docbook-xsl-root=${PREFIX}/share/xsl/docbook \
 		${_CONFIGURE_ARGS_${FLAVOR}}
 MAKE_ENV=	V=1
 MAKE_CMD=	rake -v
 MAKEFILE=	Rakefile
 ALL_TARGET=	#Empty
 
 BINARY_ALIAS=	qmake=${QMAKE} \
 		lconvert=${LCONVERT} \
 		moc=${MOC} \
 		rcc=${RCC} \
 		uic=${UIC}
 
 # Flavor handling
 _USES_qt6=		compiler:c++20-lang desktop-file-utils gl iconv localbase \
 			pkgconfig qmake:no_env qt:6 shared-mime-info tar:xz
 _USE_GL_qt6=		gl opengl
 _USE_QT_qt6=		base declarative multimedia svg tools
 _PLIST_SUB_qt6=		GUI=
 _CONFIGURE_ARGS_nogui=	--disable-gui
 _USES_nogui=		compiler:c++20-lang iconv localbase pkgconfig qmake:no_env \
 			qt:6 tar:xz
 _USE_QT_nogui=		base multimedia svg tools:build
 _PLIST_SUB_nogui=	GUI="@comment "
 
 PLIST_SUB+=		${_PLIST_SUB_${FLAVOR}}
 
 # Options handling
 OPTIONS_DEFINE=	DVDREAD FLAC NLS MANTRANS GUI
 OPTIONS_DEFAULT=	FLAC
 OPTIONS_SUB=	yes
 
 DVDREAD_DESC=		Support reading DVD chapters via libdvdread
 DVDREAD_LIB_DEPENDS=	libdvdread.so:multimedia/libdvdread
 DVDREAD_CONFIGURE_WITH=	dvdread
 
 FLAC_LIB_DEPENDS=	libFLAC.so:audio/flac
 FLAC_CONFIGURE_WITH=	flac
 
 NLS_USES=	gettext
 NLS_CONFIGURE_WITH=	gettext
 
 MANTRANS_DESC=		Build and install manpage translations
 MANTRANS_BUILD_DEPENDS=	po4a:textproc/po4a
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} != clang
 USE_CXXSTD=	c++17
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/multimedia/mkvtoolnix/distinfo b/multimedia/mkvtoolnix/distinfo
index 049ca1d64b33..f6299dec4a0d 100644
--- a/multimedia/mkvtoolnix/distinfo
+++ b/multimedia/mkvtoolnix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1714316078
-SHA256 (mkvtoolnix-84.0.tar.xz) = e9176dea435c3b06b4716fb131d53c8f2621977576ccc4aee8ff9050c0d9ea7a
-SIZE (mkvtoolnix-84.0.tar.xz) = 11325260
+TIMESTAMP = 1718430407
+SHA256 (mkvtoolnix-85.0.tar.xz) = 702442c80706c7c770ac04f7b4eed7a57e9e03ead6c5e6e90b9655dd84c8d829
+SIZE (mkvtoolnix-85.0.tar.xz) = 11326932
diff --git a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h b/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
deleted file mode 100644
index ac924ca25017..000000000000
--- a/multimedia/mkvtoolnix/files/patch-src_common_sorting.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/sorting.h.orig	2024-04-28 10:37:21 UTC
-+++ src/common/sorting.h
-@@ -27,7 +27,7 @@ template<  typename Titer
- 
- template<  typename Titer
-          , typename Tcriterion_maker
--         , typename Tcriterion = typename std::result_of< Tcriterion_maker(typename std::iterator_traits<Titer>::value_type) >::type
-+         , typename Tcriterion = typename std::invoke_result< Tcriterion_maker, typename std::iterator_traits<Titer>::value_type >::type
-          , typename Tcomparator = std::less<Tcriterion>
-          >
- void