Index: head/sysutils/automounter/Makefile
===================================================================
--- head/sysutils/automounter/Makefile
+++ head/sysutils/automounter/Makefile
@@ -2,25 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	automounter
-PORTVERSION=	1.5
+PORTVERSION=	1.5.1
 CATEGORIES=	sysutils
-MASTER_SITES=	SF/bsdadminscripts/${PORTNAME}
-EXTRACT_SUFX=	.tar.xz
 
-MAINTAINER=	kamikaze@bsdforen.de
+MAINTAINER=	kami@freebsd.org
 COMMENT=	Provides scripts to dynamically configure amd
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+LICENSE=	BSD2CLAUSE
+
+WRKSRC_SUBDIR=	src
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKSRC}/../NOTES
 
-plist: patch
-		@(cd ${WRKSRC}; ./plist.sh > ${PLIST})
+USE_GITHUB=	yes
+GH_ACCOUNT=	lonkamikaze
 
-# Use "amd -S" to avoid a vm locking panic, the scope of which has not yet
-# been determined. See kern/181590.
 do-install:
 		@(cd ${WRKSRC}; ./install.sh -destdir=${STAGEDIR} \
-			-prefix=${PREFIX} -amd="/usr/sbin/amd -S")
+			-prefix=${PREFIX})
 
 .include <bsd.port.mk>
Index: head/sysutils/automounter/distinfo
===================================================================
--- head/sysutils/automounter/distinfo
+++ head/sysutils/automounter/distinfo
@@ -1,2 +1,3 @@
-SHA256 (automounter-1.5.tar.xz) = d2d99b6ee5099dcbb18d714f16f07c2a038ab2bf9e8b7c19e9126634c32bdc0f
-SIZE (automounter-1.5.tar.xz) = 24932
+TIMESTAMP = 1464506425
+SHA256 (lonkamikaze-automounter-1.5.1_GH0.tar.gz) = d8c9b217b8f1f232c2fa95fc16a776baf802a641d1e2fce4f81f93c934f2e856
+SIZE (lonkamikaze-automounter-1.5.1_GH0.tar.gz) = 28259
Index: head/sysutils/automounter/pkg-plist
===================================================================
--- head/sysutils/automounter/pkg-plist
+++ head/sysutils/automounter/pkg-plist
@@ -1,6 +1,6 @@
-sbin/automounter
-etc/rc.d/automounter
 etc/automounter.conf.sample
 etc/devd/automounter.conf
-man/man8/automounter.8.gz
+etc/rc.d/automounter
 man/man5/automounter.conf.5.gz
+man/man8/automounter.8.gz
+sbin/automounter