diff --git a/sysutils/beadm-devel/Makefile b/sysutils/beadm-devel/Makefile
index af34883fabdb..076e8251839d 100644
--- a/sysutils/beadm-devel/Makefile
+++ b/sysutils/beadm-devel/Makefile
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	beadm
-PORTVERSION=	1.2.99.20150924
+PORTVERSION=	1.2.99.20180121
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-devel
 MASTER_SITES=	GH \
-		LOCAL/bdrewery/${PORTNAME}/ \
-		http://mirror.shatow.net/freebsd/${PORTNAME}/
+		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
+		LOCAL/bdrewery/${PORTNAME}
 
 MAINTAINER=	bdrewery@FreeBSD.org
 COMMENT=	Solaris-like utility to manage Boot Environments on ZFS
@@ -15,11 +15,11 @@ LICENSE=	BSD2CLAUSE
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	vermaden
-GH_TAGNAME=	812292829e43786db878ee2c9102b72b59f325ce
+GH_TAGNAME=	e55f535b589fb2df4e65e51482e29337b564b756
 
 NO_BUILD=	YES
 
-CONFLICTS_INSTALL=	beadm-[0-9]*
+CONFLICTS_INSTALL=	beadm-[0-9]-*
 
 PLIST_FILES=	sbin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
@@ -28,6 +28,6 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} \
 	    ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 \
-	    ${STAGEDIR}${MANPREFIX}/man/man1/
+	  ${STAGEDIR}${MANPREFIX}/man/man1/
 
 .include <bsd.port.mk>
diff --git a/sysutils/beadm-devel/distinfo b/sysutils/beadm-devel/distinfo
index 9f65d889e629..d4f938c09a23 100644
--- a/sysutils/beadm-devel/distinfo
+++ b/sysutils/beadm-devel/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vermaden-beadm-1.2.99.20150924-812292829e43786db878ee2c9102b72b59f325ce_GH0.tar.gz) = f778f9dc656801bf572c03d4172054e5517e35c410bdb989c9aca9529db95ccc
-SIZE (vermaden-beadm-1.2.99.20150924-812292829e43786db878ee2c9102b72b59f325ce_GH0.tar.gz) = 15239
+TIMESTAMP = 1516655444
+SHA256 (vermaden-beadm-1.2.99.20180121-e55f535b589fb2df4e65e51482e29337b564b756_GH0.tar.gz) = 08b658266cbb1ecb1d7b473303474c3189b0545783fdb76f7b664e9129e429a4
+SIZE (vermaden-beadm-1.2.99.20180121-e55f535b589fb2df4e65e51482e29337b564b756_GH0.tar.gz) = 15408