diff --git a/sysutils/cpu-microcode-amd/Makefile b/sysutils/cpu-microcode-amd/Makefile
index 55fe3534c7b2..0ea73959752a 100644
--- a/sysutils/cpu-microcode-amd/Makefile
+++ b/sysutils/cpu-microcode-amd/Makefile
@@ -1,44 +1,45 @@
 PORTNAME=	microcode
 PORTVERSION=	20230808
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/amd-ucode/
 PKGNAMEPREFIX=	cpu-
 PKGNAMESUFFIX=	-amd
 DISTFILES=	microcode_amd.bin?id=${_REV} \
 		microcode_amd_fam15h.bin?id=${_REV} \
 		microcode_amd_fam16h.bin?id=${_REV} \
 		microcode_amd_fam17h.bin?id=${_REV} \
 		microcode_amd_fam19h.bin?id=${_REV}
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 
-MAINTAINER=	sbruno@FreeBSD.org
+MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	AMD CPU microcode updates
 
 LICENSE=	EULA
 LICENSE_NAME=	Advanced Micro Devices License Agreement
 LICENSE_FILE=	${FILESDIR}/LICENSE.amd-ucode
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/microcode_update:sysutils/cpu-microcode-rc
 
 DATADIR=	${PREFIX}/share/cpucontrol
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	${DISTFILES:S/^/${DATADIR}\//g:C/\?.*//}
 
 _REV=		f2eb058afc57348cde66852272d6bf11da1eef8f
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 .for f in ${DISTFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DATADIR}/${f:C/\?.*//}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/cpu-microcode-intel/Makefile b/sysutils/cpu-microcode-intel/Makefile
index b6fbb9c27205..57e4217abfcd 100644
--- a/sysutils/cpu-microcode-intel/Makefile
+++ b/sysutils/cpu-microcode-intel/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	microcode
 DISTVERSIONPREFIX=	microcode-
 DISTVERSION=	20230808
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	cpu-
 PKGNAMESUFFIX=	-intel
 
-MAINTAINER=	sbruno@FreeBSD.org
+MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Intel CPU microcode updates
 WWW=		https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files
 
 LICENSE=	EULA
 LICENSE_NAME=	Intel Software License Agreement
 LICENSE_FILE=	${FILESDIR}/LICENSE
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 USES=		cpe
 
-OPTIONS_DEFINE=	RC SPLIT
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-OPTIONS_SUB=	yes
-
-RC_DESC=	Depend on RC script port (automatic update method two)
-SPLIT_DESC=	Install split files (for cpucontrol(8) and RC script)
-
-RC_IMPLIES=	SPLIT
-RC_RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/microcode_update:sysutils/cpu-microcode-rc
-
-SPLIT_VARS_OFF=	NO_BUILD=yes
-
 CPE_PART=	o
 CPE_VENDOR=	intel
 CPE_PRODUCT=	microcode
 USE_GITHUB=	yes
 GH_ACCOUNT=	intel
 GH_PROJECT=	Intel-Linux-Processor-Microcode-Data-Files
 
 DATADIR=	${PREFIX}/share/cpucontrol
 FWDIR=		/boot/firmware
 NO_ARCH=	yes
 
 NO_WRKSUBDIR=	yes
 
+OPTIONS_DEFINE=		RC SPLIT
+OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+OPTIONS_SUB=		yes
+
+RC_DESC=	Depend on RC script port (automatic update method two)
+SPLIT_DESC=	Install split files (for cpucontrol(8) and RC script)
+
+RC_IMPLIES=	SPLIT
+RC_RUN_DEPENDS=	${LOCALBASE}/etc/rc.d/microcode_update:sysutils/cpu-microcode-rc
+
+SPLIT_VARS_OFF=	NO_BUILD=yes
+
 post-extract:
 	${CAT} ${WRKSRC}/Intel-Linux-Processor-Microcode-Data-Files-${GH_TAGNAME}/intel-ucode/* \
 	  ${WRKSRC}/Intel-Linux-Processor-Microcode-Data-Files-${GH_TAGNAME}/intel-ucode-with-caveats/* \
 	  > ${WRKSRC}/intel-ucode.bin
 
 post-extract-SPLIT-on:
 	${CP} -p ${FILESDIR}/Makefile ${FILESDIR}/ucode-split.c ${WRKSRC}
 	${REINPLACE_CMD} 's|%%GH_TAGNAME%%|${GH_TAGNAME}|g' ${WRKSRC}/Makefile
 
 do-install:
 	${MKDIR} ${STAGEDIR}${FWDIR}
 	${INSTALL_DATA} ${WRKSRC}/intel-ucode.bin ${STAGEDIR}${FWDIR}/
 
 do-install-SPLIT-on:
 	${MKDIR} ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/mcodes/* ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
diff --git a/sysutils/cpu-microcode-rc/Makefile b/sysutils/cpu-microcode-rc/Makefile
index 84af71889f20..280f5fb3bc40 100644
--- a/sysutils/cpu-microcode-rc/Makefile
+++ b/sysutils/cpu-microcode-rc/Makefile
@@ -1,27 +1,28 @@
 PORTNAME=	microcode
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
+MASTER_SITES=	# none
 PKGNAMEPREFIX=	cpu-
 PKGNAMESUFFIX=	-rc
-MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	sbruno@FreeBSD.org
+MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	RC script for CPU microcode updates
 
 LICENSE=	BSD2CLAUSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 USE_RC_SUBR=	microcode_update
 
 DATADIR=	${PREFIX}/share/cpucontrol
 NO_ARCH=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
 SUB_FILES=	pkg-message
 
 NO_WRKSUBDIR=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/cpu-microcode/Makefile b/sysutils/cpu-microcode/Makefile
index 5e7635129cdf..1661c015fd2b 100644
--- a/sysutils/cpu-microcode/Makefile
+++ b/sysutils/cpu-microcode/Makefile
@@ -1,16 +1,16 @@
 PORTNAME=	microcode
 PORTVERSION=	1.0
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	cpu-
 
-MAINTAINER=	sbruno@FreeBSD.org
+MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Meta-package for CPU microcode updates
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 RUN_DEPENDS=	${LOCALBASE}/share/cpucontrol/microcode_amd.bin:sysutils/cpu-microcode-amd \
 		/boot/firmware/intel-ucode.bin:sysutils/cpu-microcode-intel
 
 USES=		metaport
 
 .include <bsd.port.mk>