diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo
index 158601cbb152..2738376d4960 100644
--- a/emulators/i386-wine-devel/distinfo
+++ b/emulators/i386-wine-devel/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1624695440
-SHA256 (FreeBSD:11:amd64/i386-wine-devel-6.11_2,1.txz) = f4d13cf6d24dd0162a83cae68642ccb907f9ee2f8dfe740f52b6066ea707df51
-SIZE (FreeBSD:11:amd64/i386-wine-devel-6.11_2,1.txz) = 99011992
-SHA256 (FreeBSD:12:amd64/i386-wine-devel-6.11_2,1.txz) = 0b75df95e48cb2cc664478cece681ce4ba00abdbc1e99cfc3d0f85c447d43fca
-SIZE (FreeBSD:12:amd64/i386-wine-devel-6.11_2,1.txz) = 99425876
-SHA256 (FreeBSD:13:amd64/i386-wine-devel-6.11_2,1.txz) = 6b4efa025f8d65df65bf55e8a3123ee668520f3becff02bb436352d2d6a12481
-SIZE (FreeBSD:13:amd64/i386-wine-devel-6.11_2,1.txz) = 99839772
-SHA256 (FreeBSD:14:amd64/i386-wine-devel-6.11_2,1.txz) = 9c427a95e624ddf9cb3bdbca30ea45d5a09f9c55ecdd7cffe52c931a5e9bc7a9
-SIZE (FreeBSD:14:amd64/i386-wine-devel-6.11_2,1.txz) = 101607056
+TIMESTAMP = 1624700086
+SHA256 (FreeBSD:11:amd64/i386-wine-devel-6.11_1,1.txz) = f4d13cf6d24dd0162a83cae68642ccb907f9ee2f8dfe740f52b6066ea707df51
+SIZE (FreeBSD:11:amd64/i386-wine-devel-6.11_1,1.txz) = 99011992
+SHA256 (FreeBSD:12:amd64/i386-wine-devel-6.11_1,1.txz) = 0b75df95e48cb2cc664478cece681ce4ba00abdbc1e99cfc3d0f85c447d43fca
+SIZE (FreeBSD:12:amd64/i386-wine-devel-6.11_1,1.txz) = 99425876
+SHA256 (FreeBSD:13:amd64/i386-wine-devel-6.11_1,1.txz) = 6b4efa025f8d65df65bf55e8a3123ee668520f3becff02bb436352d2d6a12481
+SIZE (FreeBSD:13:amd64/i386-wine-devel-6.11_1,1.txz) = 99839772
+SHA256 (FreeBSD:14:amd64/i386-wine-devel-6.11_1,1.txz) = 9c427a95e624ddf9cb3bdbca30ea45d5a09f9c55ecdd7cffe52c931a5e9bc7a9
+SIZE (FreeBSD:14:amd64/i386-wine-devel-6.11_1,1.txz) = 101607056
diff --git a/emulators/i386-wine/Makefile.amd64 b/emulators/i386-wine/Makefile.amd64
index a7c72b78866c..ea77dc5b44b9 100644
--- a/emulators/i386-wine/Makefile.amd64
+++ b/emulators/i386-wine/Makefile.amd64
@@ -1,52 +1,52 @@
 # Created by: David Naylor <dbn@FreeBSD.org>
 
 DISTVERSION=	5.0.4
 PORTEPOCH=	1
 MASTER_SITES=	http://Alexander88207.de/Homura/Winebuilds/${DIST_SUBDIR}/
 DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
 DIST_SUBDIR=	FreeBSD:${OSREL:C/\..*//}:amd64
 
 LICENSE=        LGPL21 LGPL3
 LICENSE_COMB=   dual
 LICENSE_FILE=   ${WRKDIR}/LICENSE
 
 EXTRACT_AFTER_ARGS=	-C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \
 				--exclude +MTREE_DIRS --exclude share/licenses/'*' \
 				--exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \
 				-s '|/usr/local|${STAGEDIR}${PREFIX}|gs'
 NO_BUILD=	yes
 SUB_FILES=	pkg-message
 USE_LDCONFIG32=	${PREFIX}/lib32 ${PREFIX}/lib32/wine
 USES=		desktop-file-utils tar:txz
 BUNDLE_LIBS=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTSCOUT=	limitw:1,even
 
 .for osrel in 11 12 13 14
 .if ${OSREL:C/\..*//} == ${osrel}
 PLIST_SUB+=	OSREL${osrel}=""
 PLIST_SUB+=	NOOSREL${osrel}="@comment "
 .else
 PLIST_SUB+=	OSREL${osrel}="@comment "
 PLIST_SUB+=	NOOSREL${osrel}=""
 .endif
 .endfor
 
 .if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104001 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400024))
 IGNORE=		binaries compiled for FreeBSD 11.4+, 12.2+, 13.0+ & 14.0+ only
 .endif
 
 OPTIONS_DEFINE=	GECKO MONO
 GECKO_DESC=     Bundle Gecko MSI package for Wine
 MONO_DESC=      Bundle Mono MSI package for Wine
 
 GECKO_RUN_DEPENDS=	${DATADIR}/gecko/wine-gecko-2.47.1-x86.msi:emulators/wine-gecko
 MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.9.4.msi:emulators/wine-mono
 
 do-extract:
 	@${RM} -r ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g'
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/[^/]*/LICENSE' -s '|/usr/local/share/licenses/[^/]*/||g'
 
 do-install:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}
diff --git a/emulators/i386-wine/distinfo b/emulators/i386-wine/distinfo
index 15ea90e44738..16144cca8eb3 100644
--- a/emulators/i386-wine/distinfo
+++ b/emulators/i386-wine/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1624695015
-SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4_2,1.txz) = c0792df623ef5ca2050a470aa643db183a78af0ebd17b47ac970e71d20ce4235
-SIZE (FreeBSD:11:amd64/i386-wine-5.0.4_2,1.txz) = 92984208
-SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4_2,1.txz) = 8149f3663dddeb0114b76269f869c25db9bb6edde1b03bec5415776c8286dd66
-SIZE (FreeBSD:12:amd64/i386-wine-5.0.4_2,1.txz) = 93358516
-SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4_2,1.txz) = f510e32ab3ff7337272def5e55258587dfd053c757904078e58aa3dbdced9612
-SIZE (FreeBSD:13:amd64/i386-wine-5.0.4_2,1.txz) = 93792036
-SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4_2,1.txz) = f44cf5115c98337ef4358df907196e7619029c9d6416eb7e06b91086401d5cf3
-SIZE (FreeBSD:14:amd64/i386-wine-5.0.4_2,1.txz) = 95495224
+TIMESTAMP = 1624700175
+SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4_1,1.txz) = c0792df623ef5ca2050a470aa643db183a78af0ebd17b47ac970e71d20ce4235
+SIZE (FreeBSD:11:amd64/i386-wine-5.0.4_1,1.txz) = 92984208
+SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4_1,1.txz) = 8149f3663dddeb0114b76269f869c25db9bb6edde1b03bec5415776c8286dd66
+SIZE (FreeBSD:12:amd64/i386-wine-5.0.4_1,1.txz) = 93358516
+SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4_1,1.txz) = f510e32ab3ff7337272def5e55258587dfd053c757904078e58aa3dbdced9612
+SIZE (FreeBSD:13:amd64/i386-wine-5.0.4_1,1.txz) = 93792036
+SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4_1,1.txz) = f44cf5115c98337ef4358df907196e7619029c9d6416eb7e06b91086401d5cf3
+SIZE (FreeBSD:14:amd64/i386-wine-5.0.4_1,1.txz) = 95495224