Index: head/sysutils/rpi-firmware/Makefile
===================================================================
--- head/sysutils/rpi-firmware/Makefile
+++ head/sysutils/rpi-firmware/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	rpi-firmware
 PORTVERSION=	1.20171029
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	manu@freebsd.org
@@ -13,12 +13,17 @@
 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
-GH_PROJECT=	firmware
+GH_ACCOUNT=	raspberrypi gonzoua:pscimon
+GH_PROJECT=	firmware rpi3-psci-monitor:pscimon
+PSCI_TAG=	2b8890a
+GH_TAGNAME=	${PSCI_TAG}:pscimon
+PSCI_MONITOR=	rpi3-psci-monitor-${PSCI_TAG}
+PSCI_DIR=	${WRKDIR}/${PSCI_MONITOR}
 
-NO_BUILD=	yes
-
+BUILD_WRKSRC=	${PSCI_DIR}
 INSTALL_DIR=	${PREFIX}/share/${PORTNAME}
 
 do-patch:
@@ -31,5 +36,6 @@
 do-install:
 	${MKDIR} -p ${STAGEDIR}/${INSTALL_DIR}
 	cd ${WRKSRC}/boot && ${COPYTREE_SHARE} . ${STAGEDIR}/${INSTALL_DIR}/
+	${INSTALL_DATA} ${PSCI_DIR}/armstub8.bin ${STAGEDIR}/${INSTALL_DIR}/
 
 .include <bsd.port.mk>
Index: head/sysutils/rpi-firmware/distinfo
===================================================================
--- head/sysutils/rpi-firmware/distinfo
+++ head/sysutils/rpi-firmware/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1510423514
+TIMESTAMP = 1520553310
 SHA256 (raspberrypi-firmware-1.20171029_GH0.tar.gz) = 46ce28c8d87ef22bdcc57ac1836ca3f04d1ec6f46580ff5a30bf76b3c0822117
 SIZE (raspberrypi-firmware-1.20171029_GH0.tar.gz) = 120793811
+SHA256 (gonzoua-rpi3-psci-monitor-2b8890a_GH0.tar.gz) = a7b89678adea178359646a1e95a078d5c60d23821ba355f27f14ed7b28f32f4d
+SIZE (gonzoua-rpi3-psci-monitor-2b8890a_GH0.tar.gz) = 5115
Index: head/sysutils/rpi-firmware/pkg-plist
===================================================================
--- head/sysutils/rpi-firmware/pkg-plist
+++ head/sysutils/rpi-firmware/pkg-plist
@@ -1,5 +1,6 @@
 %%DATADIR%%/COPYING.linux
 %%DATADIR%%/LICENCE.broadcom
+%%DATADIR%%/armstub8.bin
 %%DATADIR%%/bcm2708-rpi-0-w.dtb
 %%DATADIR%%/bcm2708-rpi-b-plus.dtb
 %%DATADIR%%/bcm2708-rpi-b.dtb