diff --git a/sysutils/ansible-kld/Makefile b/sysutils/ansible-kld/Makefile
--- a/sysutils/ansible-kld/Makefile
+++ b/sysutils/ansible-kld/Makefile
@@ -1,7 +1,9 @@
-PORTNAME=	ansible-kld
-DISTVERSION=	0.1
+PORTNAME=	ansible
+DISTVERSION=	g20200803
+PORTEPOCH=	1
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	-${_LIBRARY}
 
 MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Ansible module to load kernel modules or update /boot/loader.conf
@@ -12,23 +14,24 @@
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLAVOR}
 
 USES=		python shebangfix
-SHEBANG_FILES=	library/kld
-
 USE_GITHUB=	yes
+
 GH_ACCOUNT=	dlundgren
 GH_PROJECT=	ansible-freebsd-modules
-GH_TAGNAME=	cf37fc1e16fc03852abc8933e7959b22b51a5c90
+GH_TAGNAME=	537984b53018e36c2511132c3c66ac762f8b36dd
+SHEBANG_FILES=	library/${_LIBRARY}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
-ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/modules
+_LIBRARY?=	kld
+_ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/modules
 
-PLIST_FILES=	${ANSIBLE_MOD}/kld
+PLIST_FILES=	${_ANSIBLE_MOD}/${_LIBRARY}
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}
-	${INSTALL_SCRIPT} ${WRKSRC}/library/kld \
-		${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}/kld
+	${MKDIR} ${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}
+	${INSTALL_SCRIPT} ${WRKSRC}/library/${_LIBRARY} \
+		${STAGEDIR}${PREFIX}/${_ANSIBLE_MOD}/${_LIBRARY}
 
 .include <bsd.port.mk>
diff --git a/sysutils/ansible-kld/distinfo b/sysutils/ansible-kld/distinfo
--- a/sysutils/ansible-kld/distinfo
+++ b/sysutils/ansible-kld/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1569326545
-SHA256 (dlundgren-ansible-freebsd-modules-0.1-cf37fc1e16fc03852abc8933e7959b22b51a5c90_GH0.tar.gz) = 168013ef470d93eeb2a103c1613aaadceb84e6202cb9bff91166a5047a77898f
-SIZE (dlundgren-ansible-freebsd-modules-0.1-cf37fc1e16fc03852abc8933e7959b22b51a5c90_GH0.tar.gz) = 9310
+TIMESTAMP = 1618563565
+SHA256 (dlundgren-ansible-freebsd-modules-g20200803-537984b53018e36c2511132c3c66ac762f8b36dd_GH0.tar.gz) = 84c808ce8d90e93446c9320369afd3a362e8f4c363c9be9c734e6b1b92f6f53b
+SIZE (dlundgren-ansible-freebsd-modules-g20200803-537984b53018e36c2511132c3c66ac762f8b36dd_GH0.tar.gz) = 9341
diff --git a/sysutils/ansible-sysrc/Makefile b/sysutils/ansible-sysrc/Makefile
--- a/sysutils/ansible-sysrc/Makefile
+++ b/sysutils/ansible-sysrc/Makefile
@@ -1,34 +1,6 @@
-PORTNAME=	ansible-sysrc
-DISTVERSION=	0.1
-CATEGORIES=	sysutils
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-
-MAINTAINER=	lcook@FreeBSD.org
 COMMENT=	Ansible module to set sysvars in rc.conf
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible>0:sysutils/ansible@${PY_FLAVOR}
-
-USES=		python shebangfix
-SHEBANG_FILES=	library/sysrc
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	dlundgren
-GH_PROJECT=	ansible-freebsd-modules
-GH_TAGNAME=	cf37fc1e16fc03852abc8933e7959b22b51a5c90
-
-NO_ARCH=	yes
-NO_BUILD=	yes
-
-ANSIBLE_MOD=	share/${PYTHON_PKGNAMEPREFIX}ansible/plugins/modules
-
-PLIST_FILES=	${ANSIBLE_MOD}/sysrc
-
-do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}
-	${INSTALL_SCRIPT} ${WRKSRC}/library/sysrc \
-		${STAGEDIR}${PREFIX}/${ANSIBLE_MOD}/sysrc
+MASTERDIR=	${.CURDIR}/../ansible-kld
+_LIBRARY=	sysrc
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/ansible-sysrc/distinfo b/sysutils/ansible-sysrc/distinfo
deleted file mode 100644
--- a/sysutils/ansible-sysrc/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1569326595
-SHA256 (dlundgren-ansible-freebsd-modules-0.1-cf37fc1e16fc03852abc8933e7959b22b51a5c90_GH0.tar.gz) = 168013ef470d93eeb2a103c1613aaadceb84e6202cb9bff91166a5047a77898f
-SIZE (dlundgren-ansible-freebsd-modules-0.1-cf37fc1e16fc03852abc8933e7959b22b51a5c90_GH0.tar.gz) = 9310