diff --git a/sysutils/pam_xdg/Makefile b/sysutils/pam_xdg/Makefile
index fc432d668d63..8018bff29277 100644
--- a/sysutils/pam_xdg/Makefile
+++ b/sysutils/pam_xdg/Makefile
@@ -1,34 +1,28 @@
 PORTNAME=	pam_xdg
-PORTVERSION=	s20210901
+PORTVERSION=	s20210916
 CATEGORIES=	sysutils
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	PAM module to manage XDG Base Directories
 
 LICENSE=	ISCL
 
 USES=		uidfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	jbeich # mirror
 GH_PROJECT=	s-toolbox
-GH_TAGNAME=	dbede63
+GH_TAGNAME=	cdbe3ce
 PLIST_FILES=	lib/${PORTNAME}.so \
 		share/man/man8/${PORTNAME}.8.gz
 
 # pam_xdg.makefile is too crufty, so roll our own
 MAKEFILE=	bsd.lib.mk
 MAKE_ARGS+=	SHLIB_NAME="${PORTNAME}.so" MAN="${PORTNAME}.8" \
 		SRCS="${PORTNAME}.c" LDADD="-lpam" \
 		LIBDIR="${PREFIX}/lib" SHAREDIR="${PREFIX}/share"
+CFLAGS+=	-DXDG_CONFIG_DIR="${PREFIX}/etc" \
+		-DXDG_DATA_DIR_LOCAL="${PREFIX}" \
+		-DXDG_RUNTIME_DIR_OUTER="/var/run"
 LDFLAGS+=	-Wl,-z,defs
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e '/#define/ { \
-			s,/etc,${PREFIX}&,; \
-			s,/usr/local,${PREFIX},; \
-			s,/run,/var&,; \
-		}' \
-		${WRKSRC}/${PORTNAME}.c
-
 .include <bsd.port.mk>
diff --git a/sysutils/pam_xdg/distinfo b/sysutils/pam_xdg/distinfo
index 8e4e3f9bba29..3a691bf4d509 100644
--- a/sysutils/pam_xdg/distinfo
+++ b/sysutils/pam_xdg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1630715930
-SHA256 (jbeich-s-toolbox-s20210901-dbede63_GH0.tar.gz) = ae45ce4987ad0b1fc1e3dafb0a294e52e2ac224f959f36a104b31b69a62ea2d2
-SIZE (jbeich-s-toolbox-s20210901-dbede63_GH0.tar.gz) = 100448
+TIMESTAMP = 1631823427
+SHA256 (jbeich-s-toolbox-s20210916-cdbe3ce_GH0.tar.gz) = a63a9630df2808ab6bf051ba29f154270eb4e7ab0c7e523ef59a0e31d71b6efb
+SIZE (jbeich-s-toolbox-s20210916-cdbe3ce_GH0.tar.gz) = 100666