diff --git a/security/sssd2/Makefile b/security/sssd2/Makefile
index 3a73e0260ec4..b0fc081d536a 100644
--- a/security/sssd2/Makefile
+++ b/security/sssd2/Makefile
@@ -1,163 +1,164 @@
 PORTNAME=	sssd
 PORTVERSION=	2.9.6
+PORTREVISION=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	jhixson@FreeBSD.org
 COMMENT=	System Security Services Daemon
 WWW=		https://sssd.io/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS_INSTALL?=	sssd*
 
 BUILD_DEPENDS=	${PY_SETUPTOOLS} \
 		bash:shells/bash \
 		docbook-xsl>=1:textproc/docbook-xsl \
 		p11-kit:security/p11-kit \
 		nsupdate:dns/bind-tools \
 		xmlcatalog:textproc/libxml2 \
 		xmlcatmgr:textproc/xmlcatmgr \
 		xsltproc:textproc/libxslt
 
 LIB_DEPENDS=	libcares.so:dns/c-ares \
 		libcurl.so:ftp/curl \
 		libdbus-1.so:devel/dbus \
 		libdhash.so:devel/ding-libs \
 		libfido2.so:security/libfido2 \
 		libinotify.so:devel/libinotify \
 		libjansson.so:devel/jansson \
 		libjose.so:net/jose \
 		libldb.so:${SAMBA_LDB_PORT} \
 		libndr-krb5pac.so:${SAMBA_PORT} \
 		libndr-nbt.so:${SAMBA_PORT} \
 		libndr-standard.so:${SAMBA_PORT} \
 		libndr.so:${SAMBA_PORT} \
 		libp11-kit.so:security/p11-kit \
 		libpcre2-8.so:devel/pcre2 \
 		libpopt.so:devel/popt \
 		libsamba-util.so:${SAMBA_PORT} \
 		libsasl2.so:security/cyrus-sasl2 \
 		libsmbclient.so:${SAMBA_PORT} \
 		libtalloc.so:devel/talloc \
 		libtdb.so:databases/tdb \
 		libtevent.so:devel/tevent \
 		libunistring.so:devel/libunistring \
 		libuuid.so:misc/e2fsprogs-libuuid
 
 RUN_DEPENDS=	adcli:net-mgmt/adcli \
 		cyrus-sasl-gssapi>0:security/cyrus-sasl2-gssapi
 
 USES=	autoreconf cpe gettext gmake gssapi:flags,mit iconv ldap \
 	libtool localbase:ldflags pathfix pkgconfig python:3.9+ samba:env \
 	shebangfix ssl
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 
 INSTALL_TARGET=	install-strip
 CPE_VENDOR=	fedoraproject
 
 CONFIGURE_ARGS=	--disable-dependency-tracking \
 		--datadir=${DATADIR} \
 		--localstatedir=/var \
 		--disable-nls \
 		--disable-cifs-idmap-plugin \
 		--disable-valgrind \
 		--disable-systemtap \
 		--enable-pammoddir=${PREFIX}/lib \
 		--enable-ldb-version-check \
 		--enable-pac-responder \
 		--with-db-path=/var/db/sss/db \
 		--with-os=freebsd \
 		--with-plugin-path=${LOCALBASE}/lib/sssd \
 		--with-pubconf-path=/var/db/sss/pubconf  \
 		--with-pid-path=/var/run \
 		--with-pipe-path=/var/run/sss/pipes \
 		--with-mcache-path=/var/db/sss/mc \
 		--with-environment-file=${LOCALBASE}/etc/sssd \
 		--with-init-dir=no \
 		--with-manpages \
 		--with-xml-catalog-path=${LOCALBASE}/share/xml/catalog \
 		--with-krb5-plugin-path=${LOCALBASE}/lib/krb5/plugins/libkrb5 \
 		--with-krb5authdata-plugin-path=${LOCALBASE}/lib/krb5/plugins/authdata \
 		--with-krb5-conf=/etc/krb5.conf \
 		--without-python2-bindings \
 		--with-winbind-plugin-path=${LOCALBASE}/lib/samba4/modules/idmap \
 		--without-selinux \
 		--with-gpo-cache-path=/var/db/sss/gpo_cache  \
 		--without-semanage \
 		--with-app-libs=${LOCALBASE}/lib/sssd/modules \
 		--without-autofs \
 		--with-files-provider \
 		--with-passkey \
 		--with-samba \
 		--without-nfsv4-idmapd-plugin \
 		--with-secrets-db-path=/var/lib/sss/secrets \
 		--with-kcm \
 		--with-oidc-child \
 		--with-ldb-lib-dir=${LOCALBASE}/lib/shared-modules/ldb \
 		--with-smb-idmap-interface-version=6 \
 		--without-libnl \
 		--with-nscd-conf=/etc/nscd.conf \
 		--with-python_prefix=${PREFIX}
 CONFIGURE_ENV=	KRB5_CONFIG="${KRB5CONFIG}"
 
 CPPFLAGS+=	-DRENEWAL_PROG_PATH='\"${LOCALBASE}/sbin/adcli\"'
 CFLAGS+=	-fstack-protector-all
 LIBS+=		-linotify -lintl
 
 PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 MAKE_ENV=	MAKELEVEL=0 LINGUAS="bg de eu es fr hu id it ja nb nl pl pt ru sv tg tr uk zh_CN zh_TW"
 SUB_FILES=	pkg-message
 
 BINARY_ALIAS=	python3=python${PYTHON_VER}
 SHEBANG_FILES=	sbus_generate.sh.in \
 		src/tools/analyzer/sss_analyze \
 		src/tools/sss_obfuscate \
 		src/config/SSSDConfigTest.py \
 		src/tests/*.py \
 		src/tests/cwrap/cwrap_test_setup.sh \
 		src/tests/whitespace_test \
 		src/tests/multihost/data/memcachesize.py \
 		src/tests/double_semicolon_test \
 		scripts/release.sh \
 		contrib/git/pre-push \
 		contrib/ci/rpm-spec-builddeps \
 		contrib/ci/clean \
 		contrib/ci/valgrind-condense \
 		contrib/ci/run-multihost \
 		contrib/ci/run \
 		contrib/ci/get-matrix.py \
 		contrib/vagrant/bootstrap.sh \
 		contrib/fedora/make_srpm.sh
 
 USE_RC_SUBR=	${PORTNAME}
 
 USE_GITHUB=yes
 GH_ACCOUNT=sssd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/bin/|${PREFIX}/bin/|g' \
 		-e 's|/var/lib/sss/pubconf/|/var/db/sss/pubconf/|g' \
 		${WRKSRC}/src/man/sss_ssh_knownhostsproxy.1.xml \
 		${WRKSRC}/src/man/po/*.po || true
 	@${REINPLACE_CMD} -e 's|/etc/sssd/|${ETCDIR}/|g' \
 		-e 's|/etc/openldap/|${LOCALBASE}/etc/openldap/|g' \
 		${WRKSRC}/src/man/*xml || true
 	@${CP} ${FILESDIR}/sss_bsd_errno.h ${WRKSRC}/src/util/sss_bsd_errno.h
 	@${CP} ${FILESDIR}/bsdnss.c ${WRKSRC}/src/sss_client/bsdnss.c
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/examples/sssd-example.conf \
 		${STAGEDIR}${ETCDIR}/sssd.conf.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system.d
 	${INSTALL_DATA} ${WRKSRC}/src/responder/ifp/org.freedesktop.sssd.infopipe.conf \
 		${STAGEDIR}${PREFIX}/share/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/dbus-1/system-services
 	${INSTALL_DATA} ${WRKSRC}/src/responder/ifp/org.freedesktop.sssd.infopipe.service \
 		${STAGEDIR}${PREFIX}/share/dbus-1/system-services/org.freedesktop.sssd.infopipe.service
 	${LN} -sf libnss_sss.so.2 ${STAGEDIR}${PREFIX}/lib/nss_sss.so.1
 
 .include <bsd.port.mk>
diff --git a/security/sssd2/files/patch-src__util__find_uid.c b/security/sssd2/files/patch-src__util__find_uid.c
index 40f9022a5f9d..9892baab0f4c 100644
--- a/security/sssd2/files/patch-src__util__find_uid.c
+++ b/security/sssd2/files/patch-src__util__find_uid.c
@@ -1,125 +1,125 @@
 --- src/util/find_uid.c.orig	2024-05-16 11:35:27 UTC
 +++ src/util/find_uid.c
 @@ -36,6 +36,10 @@
  #include <ctype.h>
  #include <sys/time.h>
  #include <dhash.h>
 +#ifdef __FreeBSD__
 +#include <sys/sysctl.h>
 +#include <sys/user.h>
 +#endif
  
  #include "util/find_uid.h"
  #include "util/util.h"
 @@ -325,9 +329,86 @@ done:
      return ret;
  }
  
 -errno_t get_uid_table(TALLOC_CTX *mem_ctx, hash_table_t **table)
 +#ifdef __FreeBSD__
 +static errno_t get_active_uid_freebsd(hash_table_t *table, uid_t uid)
  {
 +    struct kinfo_proc *kp;
 +    hash_key_t key;
 +    hash_value_t value;
 +    size_t sz;
 +    int err, mib[3];
 +
 +    mib[0] = CTL_KERN;
 +    mib[1] = KERN_PROC;
 +    mib[2] = KERN_PROC_PROC;
 +
 +    sz = 0;
 +    err = sysctl(mib, 3, NULL, &sz, NULL, 0);
 +    if (err) {
 +        err = errno;
 +        DEBUG(SSSDBG_CRIT_FAILURE, "sysctl failed.\n");
 +        return err;
 +    }
 +    sz *= 2;
 +
 +    kp = talloc_size(NULL, sz);
 +    if (kp == NULL) {
 +        DEBUG(SSSDBG_CRIT_FAILURE, "talloc failed.\n");
 +        return ENOMEM;
 +    }
 +
 +    err = sysctl(mib, 3, kp, &sz, NULL, 0);
 +    if (err) {
 +        err = errno;
 +        DEBUG(SSSDBG_CRIT_FAILURE, "sysctl failed.\n");
 +        talloc_free(kp);
 +        return err;
 +    }
 +
-+    err = ENOENT;
++    err = table != NULL ? 0 : ENOENT;
 +    for (size_t i = 0; i < sz / sizeof(struct kinfo_proc); i++) {
-+        if (kp[i].ki_uid == 0) {
++        if (kp[i].ki_pid == 0) {
 +            continue;
 +        }
 +
 +        if (table != NULL) {
 +            key.type = HASH_KEY_ULONG;
 +            key.ul = (unsigned long) kp[i].ki_ruid;
 +            value.type = HASH_VALUE_ULONG;
 +            value.ul = (unsigned long) kp[i].ki_ruid;
 +
 +            err = hash_enter(table, &key, &value);
 +            if (err != HASH_SUCCESS) {
 +                DEBUG(SSSDBG_CRIT_FAILURE,
 +                      "cannot add to table [%s]\n", hash_error_string(err));
 +                err = ENOMEM;
 +                break;
 +            }
 +        } else {
 +            if (kp[i].ki_ruid == uid) {
 +                err = EOK;
 +                break;
 +            }
 +        }
 +    }
 +    talloc_free(kp);
 +    return err;
 +}
 +#endif /* __FreeBSD__ */
 +
 +static errno_t get_active_uid(hash_table_t *table, uid_t uid)
 +{
  #ifdef __linux__
 +    return get_active_uid_linux(table, uid);
 +#elif defined(__FreeBSD__)
 +    return get_active_uid_freebsd(table, uid);
 +#else
 +    return ENOSYS;
 +#endif
 +}
 +
 +errno_t get_uid_table(TALLOC_CTX *mem_ctx, hash_table_t **table)
 +{
      int ret;
  
      ret = hash_create_ex(0, table, 0, 0, 0, 0,
 @@ -339,10 +420,7 @@ errno_t get_uid_table(TALLOC_CTX *mem_ctx, hash_table_
          return ENOMEM;
      }
  
 -    return get_active_uid_linux(*table, 0);
 -#else
 -    return ENOSYS;
 -#endif
 +    return get_active_uid(*table, 0);
  }
  
  errno_t check_if_uid_is_active(uid_t uid, bool *result)
 @@ -365,9 +443,9 @@ errno_t check_if_uid_is_active(uid_t uid, bool *result
      /* fall back to the old method */
  #endif
  
 -    ret = get_active_uid_linux(NULL, uid);
 +    ret = get_active_uid(NULL, uid);
      if (ret != EOK && ret != ENOENT) {
 -        DEBUG(SSSDBG_CRIT_FAILURE, "get_active_uid_linux() failed.\n");
 +        DEBUG(SSSDBG_CRIT_FAILURE, "get_active_uid() failed.\n");
          return ret;
      }