Index: sysutils/u-boot-master/Makefile
===================================================================
--- sysutils/u-boot-master/Makefile
+++ sysutils/u-boot-master/Makefile
@@ -8,6 +8,7 @@
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
 MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
+DIST_SUBDIR=	u-boot
 
 MAINTAINER?=	uboot@FreeBSD.org
 COMMENT=	Cross-build das u-boot for model ${MODEL}
Index: sysutils/u-boot-master/distinfo
===================================================================
--- sysutils/u-boot-master/distinfo
+++ sysutils/u-boot-master/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1532285141
-SHA256 (u-boot-2018.07.tar.bz2) = 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4
-SIZE (u-boot-2018.07.tar.bz2) = 12586212
-SHA256 (937869/mbox/?) = 24fbed0558cc51d22741f72c5676eee1109af59db60c845437db19143322454d
-SIZE (937869/mbox/?) = 1238
-SHA256 (939129/mbox/?) = bc389b925af88f0e49fe459eefa6de3eb950537457b333958d758c38976210d0
-SIZE (939129/mbox/?) = 1112
+TIMESTAMP = 1532365662
+SHA256 (u-boot/u-boot-2018.07.tar.bz2) = 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4
+SIZE (u-boot/u-boot-2018.07.tar.bz2) = 12586212
+SHA256 (u-boot/937869/raw) = 5959afb53dc744d9548a2d05a2a98d7c76e66570156353fc4f1220a648b8ac05
+SIZE (u-boot/937869/raw) = 322
+SHA256 (u-boot/939129/raw) = 2a4ebf283aec8e74ec77b3cb071c6883f73807454ca94fea78361c7391187b97
+SIZE (u-boot/939129/raw) = 310
Index: sysutils/u-boot-rpi/Makefile
===================================================================
--- sysutils/u-boot-rpi/Makefile
+++ sysutils/u-boot-rpi/Makefile
@@ -2,15 +2,15 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+PATCHFILES+=	937869/raw	\
+		939129/raw
+
 MODEL=		rpi
 BOARD_CONFIG=	rpi_defconfig
 FAMILY=		rpi
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
-PATCHFILES+=	937869/mbox/?	\
-		939129/mbox/?
-
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi_fragment
 FRAGMENT_NAME=		rpi_fragment
 
Index: sysutils/u-boot-rpi2/Makefile
===================================================================
--- sysutils/u-boot-rpi2/Makefile
+++ sysutils/u-boot-rpi2/Makefile
@@ -2,15 +2,15 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+PATCHFILES+=	937869/raw	\
+		939129/raw
+
 MODEL=		rpi2
 BOARD_CONFIG=	rpi_2_defconfig
 FAMILY=		rpi
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
-PATCHFILES+=	937869/mbox/?	\
-		939129/mbox/?
-
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi2_fragment
 FRAGMENT_NAME=	rpi2_fragment
 
Index: sysutils/u-boot-rpi3/Makefile
===================================================================
--- sysutils/u-boot-rpi3/Makefile
+++ sysutils/u-boot-rpi3/Makefile
@@ -2,6 +2,10 @@
 
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
+EXTRA_PATCHES=	${.CURDIR}/files/
+PATCHFILES+=	937869/raw	\
+		939129/raw
+
 MODEL=		rpi3
 BOARD_CONFIG=	rpi_3_defconfig
 FAMILY=		rpi
@@ -9,10 +13,6 @@
 
 DEPENDS=	${LOCALBASE}/share/rpi-firmware/bootcode.bin:sysutils/rpi-firmware
 
-EXTRA_PATCHES=	${.CURDIR}/files/
-PATCHFILES+=	937869/mbox/?	\
-		939129/mbox/?
-
 CONFIG_FRAGMENT=	${.CURDIR}/files/rpi3_fragment
 FRAGMENT_NAME=	rpi3_fragment