diff --git a/sysutils/rpi-firmware/Makefile b/sysutils/rpi-firmware/Makefile
index 639770dfe035..c42545c07b05 100644
--- a/sysutils/rpi-firmware/Makefile
+++ b/sysutils/rpi-firmware/Makefile
@@ -1,52 +1,52 @@
 PORTNAME=	rpi-firmware
 PORTVERSION=	1.20210303.g20210303
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	uboot@FreeBSD.org
 COMMENT=	Firmware for RaspberryPi Single Board Computer
 WWW=		https://github.com/raspberrypi/firmware
 
 LICENSE=	BROADCOM
 LICENSE_NAME=	Broadcom Corporation
 LICENSE_FILE=	${WRKSRC}/boot/LICENCE.broadcom
 LICENSE_PERMS=	dist-mirror no-dist-sell pkg-mirror no-pkg-sell auto-accept
 
 BUILD_DEPENDS=	aarch64-none-elf-gcc:devel/aarch64-none-elf-gcc
 
 USE_GITHUB=	yes
 
-GH_ACCOUNT=	raspberrypi gonzoua:pscimon
+GH_ACCOUNT=	raspberrypi freebsd:pscimon
 GH_PROJECT=	firmware rpi3-psci-monitor:pscimon
 FW_TAG=		fcf8d2f
 PSCI_TAG=	558620c
 GH_TAGNAME=	${FW_TAG} ${PSCI_TAG}:pscimon
 
 BUILD_WRKSRC=	${WRKSRC_pscimon}
 INSTALL_DIR=	${PREFIX}/share/${PORTNAME}
 
 CONFIG_TXT_FILES=	config.txt \
 			config_rpi_0_w.txt \
 			config_rpi3.txt \
 			config_rpi3_edk2.txt \
 			config_rpi4.txt \
 			config_arm64.txt
 
 do-patch:
 .for i in ${CONFIG_TXT_FILES}
 	${CP} ${FILESDIR}/${i} ${WRKSRC}/boot/
 .endfor
 
 post-patch:
 	${RM} ${WRKSRC}/boot/kernel.img
 	${RM} ${WRKSRC}/boot/kernel7.img
 	${RM} ${WRKSRC}/boot/kernel7l.img
 	${RM} ${WRKSRC}/boot/kernel8.img
 
 do-install:
 	${MKDIR} ${STAGEDIR}/${INSTALL_DIR}
 	cd ${WRKSRC}/boot && ${COPYTREE_SHARE} . ${STAGEDIR}/${INSTALL_DIR}/
 	${INSTALL_DATA} ${WRKSRC_pscimon}/armstub8.bin \
 	    ${WRKSRC_pscimon}/armstub8-gic.bin ${STAGEDIR}/${INSTALL_DIR}/
 
 .include <bsd.port.mk>
diff --git a/sysutils/rpi-firmware/distinfo b/sysutils/rpi-firmware/distinfo
index 2e1e0c92066a..2b5d6de71415 100644
--- a/sysutils/rpi-firmware/distinfo
+++ b/sysutils/rpi-firmware/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1614939753
+TIMESTAMP = 1690822959
 SHA256 (raspberrypi-firmware-1.20210303.g20210303-fcf8d2f_GH0.tar.gz) = 5a0d7247490e0207f0fc32baabcec25a0e97ebdab9cbee216bf9537a1de22e69
 SIZE (raspberrypi-firmware-1.20210303.g20210303-fcf8d2f_GH0.tar.gz) = 192233875
-SHA256 (gonzoua-rpi3-psci-monitor-558620c_GH0.tar.gz) = 7621db7933eedaa17a03c282ef8a50be597bd14366149dfa93172d1b3985dbb7
-SIZE (gonzoua-rpi3-psci-monitor-558620c_GH0.tar.gz) = 5614
+SHA256 (freebsd-rpi3-psci-monitor-558620c_GH0.tar.gz) = 7621db7933eedaa17a03c282ef8a50be597bd14366149dfa93172d1b3985dbb7
+SIZE (freebsd-rpi3-psci-monitor-558620c_GH0.tar.gz) = 5614