diff --git a/emulators/i386-wine-devel/Makefile.amd64 b/emulators/i386-wine-devel/Makefile.amd64
index 86444cf2d099..a9797f89f703 100644
--- a/emulators/i386-wine-devel/Makefile.amd64
+++ b/emulators/i386-wine-devel/Makefile.amd64
@@ -1,52 +1,52 @@
 # Created by: David Naylor <dbn@FreeBSD.org>
 # $FreeBSD$
 
 DISTVERSION=	5.5
 PORTEPOCH=	1
 MASTER_SITES=	LOCAL/salvadore/i386-wine-devel/${DIST_SUBDIR}/
-DISTNAME=	${PKGNAME}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION},${PORTEPOCH}
 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=		tar:txz desktop-file-utils
+USES=		desktop-file-utils tar:txz
 BUNDLE_LIBS=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .for osrel in 11 12 13
 .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} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
 IGNORE=		binaries compiled for FreeBSD 11.3+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) 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-devel
 MONO_RUN_DEPENDS=	${DATADIR}/mono/wine-mono-4.9.4.msi:emulators/wine-mono-devel
 
 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'
 
 do-install:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}
diff --git a/emulators/i386-wine/Makefile b/emulators/i386-wine/Makefile
index ee446ccfca7a..337513b7909a 100644
--- a/emulators/i386-wine/Makefile
+++ b/emulators/i386-wine/Makefile
@@ -1,36 +1,37 @@
 # Created by: David Naylor (dbn@FreeBSD.org)
 # $FreeBSD$
 
 # Special bootstrapper to allow:
 #  - i386 specific port to be slave to ${PORTSDIR}/emulators/wine
 #  - amd64 specific port to be normal port (based on binary package)
 
 PORTNAME=	wine
 # define a dummy DISTVERSION to avoid errors with poudriere bulk -a
 # on architectures unsupported by this port
 DISTVERSION?=	0
+PORTREVISION=	1
 PKGNAMEPREFIX=	i386-
 CATEGORIES=	emulators
 
 MAINTAINER=	salvadore@FreeBSD.org
 COMMENT=	32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD
 
 ONLY_FOR_ARCHS=	i386 amd64
 
 CONFLICTS_INSTALL=	wine-[0-9]* wine-devel-[0-9]* i386-wine-devel-[0-9]*
 
 PKGINSTALL=	${.CURDIR}/files/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 
 distinfo-update:
 	${RM} ${.CURDIR}/distinfo ${.CURDIR}/distinfo~
 .for osrel in 11 12 13
 	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
 	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
 	${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~
 	${RM} ${.CURDIR}/distinfo
 .endfor
 	${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${.CURDIR}/distinfo
 	${RM} ${.CURDIR}/distinfo~
 
 .include <bsd.port.mk>
diff --git a/emulators/i386-wine/Makefile.amd64 b/emulators/i386-wine/Makefile.amd64
index 8533b3a88b69..d05ce786e067 100644
--- a/emulators/i386-wine/Makefile.amd64
+++ b/emulators/i386-wine/Makefile.amd64
@@ -1,53 +1,53 @@
 # Created by: David Naylor <dbn@FreeBSD.org>
 # $FreeBSD$
 
 DISTVERSION=	5.0
 PORTEPOCH=	1
 MASTER_SITES=	LOCAL/salvadore/i386-wine/${DIST_SUBDIR}/
-DISTNAME=	${PKGNAME}
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION},${PORTEPOCH}
 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=		tar:txz
+USES=		desktop-file-utils tar:txz
 BUNDLE_LIBS=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PORTSCOUT=	limitw:1,even
 
 .for osrel in 11 12 13
 .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} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1201000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300084 && ${OSVERSION} < 1400000))
 IGNORE=		binaries compiled for FreeBSD 11.3+, 12.1+ and 13.0-CURRENT (OSVERSION >= 1300084) 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'
 
 do-install:
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS}