diff --git a/misc/mime-support/Makefile b/misc/mime-support/Makefile
index 1dabc06ec6c8..01a1080d1326 100644
--- a/misc/mime-support/Makefile
+++ b/misc/mime-support/Makefile
@@ -1,31 +1,31 @@
 PORTNAME=	mime-support
-PORTVERSION=	3.62
+PORTVERSION=	3.66
 CATEGORIES=	misc
-MASTER_SITES=	DEBIAN_POOL
-DISTNAME=	${PORTNAME}_${PORTVERSION:C/([0-9]*\.[0-9]*)\.(.*)/\1-\2/}
+MASTER_SITES=	DEBIAN
+MASTER_SITE_SUBDIR=	pool/main/m/mailcap pool/main/m/media-types
+DISTFILES=	media-types_10.1.0.tar.xz mailcap_3.69.tar.xz
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	MIME Media Types list
 WWW=		https://packages.qa.debian.org/m/mime-support.html
 
 LICENSE=	PD
 
-USES=		cpe shebangfix
+USES=		cpe shebangfix tar:xz
 
 CPE_VENDOR=	debian
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 NO_ARCH=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/run-mailcap etc/mime.types \
 		man/man1/run-mailcap.1.gz
 
-SHEBANG_FILES=	run-mailcap
+SHEBANG_FILES=	mailcap/run-mailcap
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/run-mailcap ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/mime.types ${STAGEDIR}${PREFIX}/etc
-	${INSTALL_MAN} ${WRKSRC}/run-mailcap.man ${STAGEDIR}${MANPREFIX}/man/man1/run-mailcap.1
+	${INSTALL_SCRIPT} ${WRKSRC}/mailcap/run-mailcap ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/media-types/mime.types ${STAGEDIR}${PREFIX}/etc
+	${INSTALL_MAN} ${WRKSRC}/mailcap/run-mailcap.man ${STAGEDIR}${MANPREFIX}/man/man1/run-mailcap.1
 
 .include <bsd.port.mk>
diff --git a/misc/mime-support/distinfo b/misc/mime-support/distinfo
index 0b1891054204..782e7e4060c0 100644
--- a/misc/mime-support/distinfo
+++ b/misc/mime-support/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1555683589
-SHA256 (mime-support_3.62.tar.gz) = 54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a
-SIZE (mime-support_3.62.tar.gz) = 37130
+TIMESTAMP = 1697125650
+SHA256 (media-types_10.1.0.tar.xz) = c35ec1ae0d0446aa903322f8f91a908a0d4270444326bfbad24b61fbe5600a0d
+SIZE (media-types_10.1.0.tar.xz) = 59052
+SHA256 (mailcap_3.69.tar.xz) = 969c6e24d861f1c50203d93f8b5ddc680a2e2c3fd84de489b1b65baad92120cb
+SIZE (mailcap_3.69.tar.xz) = 26644