Index: sysutils/u-boot-master/Makefile
===================================================================
--- sysutils/u-boot-master/Makefile
+++ sysutils/u-boot-master/Makefile
@@ -5,13 +5,12 @@
 
 PORTNAME=	u-boot
 PORTVERSION=	${UBOOT_VERSION}
-PORTREVISION=	1
-DISTVERSIONPREFIX=	ports-v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX?=	-${MODEL}
+MASTER_SITES=	ftp://ftp.denx.de/pub/u-boot/
 
-MAINTAINER=	imp@FreeBSD.org
-COMMENT=	Cross-build das u-boot for model ${MODEL}
+MAINTAINER?=	uboot@FreeBSD.org
+COMMENT?=	Cross-build das u-boot for model ${MODEL}
 
 LICENSE=	GPLv2
 
@@ -20,14 +19,10 @@
 		dtc>=1.4.1:sysutils/dtc
 BUILD_DEPENDS+=	${COMPILER}:devel/${COMPILER}
 
-USES=		gmake python:2.7,build shebangfix
-BINARY_ALIAS=	swig=swig3.0 sed=gsed
+USES=		tar:bz2 gmake python:2.7,build shebangfix
+BINARY_ALIAS=	swig=swig3.0 sed=gsed dtc=${LOCALBASE}/bin/dtc
 
-USE_GITHUB=	yes
-GH_ACCOUNT=	freebsd
-GH_PROJECT=	u-boot
-
-SHEBANG_FILES=	lib/libfdt/pylibfdt/setup.py
+SHEBANG_FILES=	tools/binman/binman.py
 SSP_UNSAFE=	yes
 UBOOT_DIR=	share/u-boot/${PORTNAME}${PKGNAMESUFFIX}
 INST=		${PREFIX}/${UBOOT_DIR}
@@ -74,7 +69,7 @@
 .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu})
 UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}}
 .endif
-UBOOT_VERSION?=	2017.09.00
+UBOOT_VERSION?=	2018.01
 
 .if !defined(UBOOT_PLIST) && defined(UBOOT_PLIST_${FAMILY:tu})
 UBOOT_PLIST=${UBOOT_PLIST_${FAMILY:tu}}
@@ -115,16 +110,16 @@
 .endfor
 PLIST_FILES+=	${UBOOT_DIR}/README
 
-do-configure:
-	(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${MAKE_CMD} ${BOARD_CONFIG})
-
-# U-Boot for Allwinner 64bits SoCs is splited in two parts
-# Generate a single binary to ease deployement on sdcard
+# U-Boot for Allwinner 64bits SoCs is split into two parts;
+# generate a single binary to ease deployement on sdcard
 .if defined(FAMILY) && ${FAMILY} == allwinner64
 post-build:
 	${CAT} ${WRKSRC}/spl/sunxi-spl.bin ${WRKSRC}/u-boot.itb > ${WRKSRC}/u-boot-sunxi-with-spl.bin
 .endif
 
+# post-build:
+#	see Makefile.github for UBOOT_ARCH == arm case
+
 # If we need to put anything into WRKSRC, do so now so we can build the PLIST
 # in do-install
 .if defined(UBOOT_MOVE)
@@ -139,4 +134,10 @@
 .endfor
 	${INSTALL_DATA} ${DESCR} ${STAGEDIR}/${INST}/README
 
+.if !defined(USE_FREEBSD_GITHUB_REPO)
+.include "Makefile.upstream"
+.else
+.include "Makefile.github"
+.endif
+
 .include <bsd.port.mk>
Index: sysutils/u-boot-master/distinfo
===================================================================
--- sysutils/u-boot-master/distinfo
+++ sysutils/u-boot-master/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508182195
-SHA256 (freebsd-u-boot-ports-v2017.09.00_GH0.tar.gz) = 5e408dee8be45e11293771a7d8a91250dad20711088195f5d6da99d42f5d4f7e
-SIZE (freebsd-u-boot-ports-v2017.09.00_GH0.tar.gz) = 14429809
+TIMESTAMP = 1515874341
+SHA256 (u-boot-2018.01.tar.bz2) = 938f597394b33e82e5af8c98bd5ea1a238f61892aabef36384adbf7ca5b52dda
+SIZE (u-boot-2018.01.tar.bz2) = 12023681