diff --git a/multimedia/mediainfo/Makefile b/multimedia/mediainfo/Makefile
index 9b7c3737d89f..a4f72c5ba748 100644
--- a/multimedia/mediainfo/Makefile
+++ b/multimedia/mediainfo/Makefile
@@ -1,29 +1,34 @@
 PORTNAME=	mediainfo
-PORTVERSION=	22.12
+DISTVERSION=	22.12
+PORTREVISION=	1
 CATEGORIES=	multimedia
-MASTER_SITES=	https://mediaarea.net/download/binary/mediainfo/${PORTVERSION}/ \
+MASTER_SITES=	https://mediaarea.net/download/source/${PORTNAME}/${DISTVERSION}/ \
 		LOCAL/sunpoet
-DISTNAME=	MediaInfo_CLI_${PORTVERSION}_GNU_FromSource
+DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Provides technical and tag information for video and audio files
 WWW=		https://mediaarea.net/en/MediaInfo \
 		https://github.com/MediaArea/MediaInfo
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/../../../License.html
 
 LIB_DEPENDS=	libmediainfo.so:multimedia/libmediainfo \
 		libzen.so:multimedia/libzen
 
-USES=		compiler:c++11-lang cpe libtool pathfix pkgconfig tar:xz
+USES=		autoreconf compiler:c++11-lang cpe dos2unix libtool pathfix \
+		pkgconfig tar:xz
 
 GNU_CONFIGURE=	yes
+USE_CXXSTD=	c++11
 USE_LDCONFIG=	yes
+CPE_VENDOR=	mediaarea
+DOS2UNIX_GLOB=	*.c *.cpp *.h
+DOS2UNIX_WRKSRC=	${WRKDIR}
 
-PLIST_FILES=	bin/mediainfo
-WRKSRC=		${WRKDIR}/MediaInfo_CLI_GNU_FromSource/MediaInfo/Project/GNU/CLI
+WRKSRC=		${WRKDIR}/MediaInfo/Project/GNU/CLI
 
-CPE_VENDOR=	mediaarea
+PLIST_FILES=	bin/mediainfo
 
 .include <bsd.port.mk>
diff --git a/multimedia/mediainfo/distinfo b/multimedia/mediainfo/distinfo
index 995778948454..e895b60276f5 100644
--- a/multimedia/mediainfo/distinfo
+++ b/multimedia/mediainfo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1674589524
-SHA256 (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = e67ce7419ec6af9fb54ffbe3164a42ae1cd874a7e559bfff017868cef1106947
-SIZE (MediaInfo_CLI_22.12_GNU_FromSource.tar.xz) = 3352944
+TIMESTAMP = 1678695521
+SHA256 (mediainfo_22.12.tar.xz) = 932b82739f738e7db603cf5bb170720731a9e7c61d145c2a54aabb3cd0b753bc
+SIZE (mediainfo_22.12.tar.xz) = 2026408