diff --git a/sysutils/ansible/Makefile b/sysutils/ansible/Makefile
index d8c4c8e2bcac..e0d5c757c25c 100644
--- a/sysutils/ansible/Makefile
+++ b/sysutils/ansible/Makefile
@@ -1,49 +1,50 @@
 PORTNAME=	ansible
 DISTVERSION=	8.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Radically simple IT automation
 WWW=		https://www.ansible.com/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}ansible-core>0:sysutils/py-ansible-core@${PY_FLAVOR} \
 		 ${PYTHON_PKGNAMEPREFIX}importlib-resources>0:devel/py-importlib-resources@${PY_FLAVOR}
 
 USES=		ansible:env cpe python:3.9+ shebangfix
 CPE_VENDOR=	redhat
 USE_PYTHON=	autoplist concurrent distutils
 
 SHEBANG_FILES=	ansible_collections/community/zabbix/roles/zabbix_proxy/files/install_semodule.bsx \
 		ansible_collections/community/zabbix/roles/zabbix_server/files/install_semodule.bsx \
 		ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr \
 		ansible_collections/ovirt/ovirt/roles/disaster_recovery/files/ovirt-dr
 # It's probably best to leave shebangs in modules untouched as they must be
 # either unversioned or absent.
 # See [1] and [2].
 # [1]: https://github.com/ansible/ansible/issues/78243
 # [2]: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=265211
 SHEBANG_REGEX=	(([^/])|(/[^m])|(/m[^o])|(/mo[^d])|(/mod[^u])|(/modu[^l])|(/modul[^e])|(/module[^s])|(/modules[^/]))*\.(py|sh|build.py.generic)
 python_OLD_CMD=	/Users/kbreit/Documents/Programming/ansible_collections/cisco/meraki/venv/bin/python
 
 NO_ARCH=	yes
 
 DO_MAKE_TEST=	env LC_ALL=C.UTF-8 ansible -m ping
 TEST_TARGET=	localhost
 
 post-patch:
 	${FIND} ${WRKSRC} -type f -exec ${GREP} --null -El '(/etc/ansible|/usr/share/ansible)' {} + | ${XARGS} -n 500 -0 ${REINPLACE_CMD} \
 		-e 's|/etc/ansible|${ETCDIR}|g' \
 		-e 's|/usr/share/ansible|${DATADIR}|g'
 	${FIND} ${WRKSRC} -type f -name "*.bak" -delete
 
 .include <bsd.port.mk>
 
 # Make sure that we override the unique DATADIR and ETCDIR set
 # by the implicit USES=uniquefiles.
 DATADIR=	${ANSIBLE_DATADIR}
 ETCDIR=		${ANSIBLE_ETCDIR}
diff --git a/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py b/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py
new file mode 100644
index 000000000000..e89669b4830c
--- /dev/null
+++ b/sysutils/ansible/files/patch-ansible__collections_ansible_utils_plugins_plugin__utils_base_ipaddr_utils.py
@@ -0,0 +1,20 @@
+--- ansible_collections/ansible/utils/plugins/plugin_utils/base/ipaddr_utils.py.orig	2023-09-07 02:17:47.000000000 -0700
++++ ansible_collections/ansible/utils/plugins/plugin_utils/base/ipaddr_utils.py	2024-05-15 08:23:34.190190000 -0700
+@@ -289,7 +289,7 @@
+ 
+ 
+ def _private_query(v, value):
+-    if v.is_private():
++    if not v.ip.is_global():
+         return value
+ 
+ 
+@@ -298,7 +298,7 @@
+     if all(
+         [
+             v_ip.is_unicast(),
+-            not v_ip.is_private(),
++            v_ip.is_global(),
+             not v_ip.is_loopback(),
+             not v_ip.is_netmask(),
+             not v_ip.is_hostmask(),