Index: head/sysutils/rpi-firmware/Makefile
===================================================================
--- head/sysutils/rpi-firmware/Makefile
+++ head/sysutils/rpi-firmware/Makefile
@@ -1,10 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	rpi-firmware
-PORTVERSION=	1.20180328
+PORTVERSION=	1.20180619
 CATEGORIES=	sysutils
 
-MAINTAINER=	manu@freebsd.org
+MAINTAINER=	uboot@freebsd.org
 COMMENT=	Firmware for RaspberryPi Single Board Computer
 
 LICENSE=	BROADCOM
@@ -26,8 +26,8 @@
 INSTALL_DIR=	${PREFIX}/share/${PORTNAME}
 
 do-patch:
-	${CP} ${FILESDIR}/config.txt ${WRKSRC}/boot/
-	${CP} ${FILESDIR}/config_rpi3.txt ${WRKSRC}/boot/
+	${CP} ${FILESDIR}/config.txt ${FILESDIR}/config_rpi_0_w.txt \
+	${FILESDIR}/config_rpi3.txt ${WRKSRC}/boot/
 
 post-patch:
 	${RM} ${WRKSRC}/boot/kernel.img
Index: head/sysutils/rpi-firmware/distinfo
===================================================================
--- head/sysutils/rpi-firmware/distinfo
+++ head/sysutils/rpi-firmware/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1526136538
-SHA256 (raspberrypi-firmware-1.20180328_GH0.tar.gz) = 44731225495bb211353dd86fbead980f8bb62930a3ec6711ed7094aff2397758
-SIZE (raspberrypi-firmware-1.20180328_GH0.tar.gz) = 122075858
+TIMESTAMP = 1530704759
+SHA256 (raspberrypi-firmware-1.20180619_GH0.tar.gz) = e657478923220947321503ef980f3a6772d6f1e11b48c5c359bdb5e3d49355d9
+SIZE (raspberrypi-firmware-1.20180619_GH0.tar.gz) = 122571494
 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/files/config.txt
===================================================================
--- head/sysutils/rpi-firmware/files/config.txt
+++ head/sysutils/rpi-firmware/files/config.txt
@@ -2,3 +2,4 @@
 enable_uart=1
 kernel=u-boot.bin
 kernel7=u-boot.bin
+dtoverlay=mmc
Index: head/sysutils/rpi-firmware/files/config_rpi_0_w.txt
===================================================================
--- head/sysutils/rpi-firmware/files/config_rpi_0_w.txt
+++ head/sysutils/rpi-firmware/files/config_rpi_0_w.txt
@@ -0,0 +1,6 @@
+init_uart_clock=3000000
+enable_uart=1
+kernel=u-boot.bin
+kernel7=u-boot.bin
+dtoverlay=mmc
+dtoverlay=pi3-disable-bt
Index: head/sysutils/rpi-firmware/pkg-plist
===================================================================
--- head/sysutils/rpi-firmware/pkg-plist
+++ head/sysutils/rpi-firmware/pkg-plist
@@ -11,6 +11,7 @@
 %%DATADIR%%/bcm2710-rpi-cm3.dtb
 %%DATADIR%%/bootcode.bin
 %%DATADIR%%/config.txt
+%%DATADIR%%/config_rpi_0_w.txt
 %%DATADIR%%/config_rpi3.txt
 %%DATADIR%%/fixup.dat
 %%DATADIR%%/fixup_cd.dat