diff --git a/sysutils/auto-admin/Makefile b/sysutils/auto-admin/Makefile
index c0f264f4cf70..b78bed69480a 100644
--- a/sysutils/auto-admin/Makefile
+++ b/sysutils/auto-admin/Makefile
@@ -1,17 +1,18 @@
 # $FreeBSD$
 
 PORTNAME=	auto-admin
-DISTVERSION=	0.6.2
+DISTVERSION=	0.6.4
 CATEGORIES=	sysutils
-MASTER_SITES=	http://acadix.biz/Ports/distfiles/ \
-		http://outpaddling.mooo.com/~bacon/Acadix/Ports/distfiles/
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Portable tools for automating systems management
 
 LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		tar:xz
+USE_GITHUB=	yes
+
+GH_ACCOUNT=	outpaddling
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/sysutils/auto-admin/distinfo b/sysutils/auto-admin/distinfo
index 6f2aa7706f2f..1def4eb4315e 100644
--- a/sysutils/auto-admin/distinfo
+++ b/sysutils/auto-admin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588342252
-SHA256 (auto-admin-0.6.2.tar.xz) = ebfb76f128f10e9505de4cdea230d57f3aff3fa01c8fc5e797b5ff4ea72e9684
-SIZE (auto-admin-0.6.2.tar.xz) = 73200
+TIMESTAMP = 1591120881
+SHA256 (outpaddling-auto-admin-0.6.4_GH0.tar.gz) = 5f362dc63bc619e8895478f5385d5e6aea0045e461c1f31f01f1cf6d1f4c323e
+SIZE (outpaddling-auto-admin-0.6.4_GH0.tar.gz) = 91800
diff --git a/sysutils/auto-admin/pkg-plist b/sysutils/auto-admin/pkg-plist
index 478d9eb3c7bf..3ca3e29a371f 100644
--- a/sysutils/auto-admin/pkg-plist
+++ b/sysutils/auto-admin/pkg-plist
@@ -103,6 +103,7 @@ sbin/auto-restore-user
 sbin/auto-root-check
 sbin/auto-secure-directory
 sbin/auto-service-enabled
+sbin/auto-set-conf-var
 sbin/auto-set-hostname
 sbin/auto-set-lid-switch-mode
 sbin/auto-set-memory-limits
@@ -111,6 +112,7 @@ sbin/auto-set-umask
 sbin/auto-sound-driver-setup
 sbin/auto-ssh-authorize
 sbin/auto-ssh-reverse-authorize
+sbin/auto-su+j-toggle
 sbin/auto-transfer-pw
 sbin/auto-unlock-local-pw
 sbin/auto-unlock-user
@@ -121,5 +123,6 @@ sbin/auto-useradd
 sbin/auto-using-pkgsrc
 sbin/auto-wheel-check
 sbin/auto-wifi-failover
+sbin/auto-write-cache-toggle
 sbin/auto-xdm-toggle
 %%DATADIR%%/ipfw-rules.sh