Index: mail/qmailadmin/Makefile
===================================================================
--- mail/qmailadmin/Makefile	(revision 423112)
+++ mail/qmailadmin/Makefile	(working copy)
@@ -86,7 +86,7 @@
 .if ${PORT_OPTIONS:MCRACKLIB}
 EXTRA_PATCHES+=		${FILESDIR}/cracklib.patch
 BUILD_DEPENDS+=		${LOCALBASE}/include/crack.h:security/cracklib
-CONFIGURE_ARGS+=	--enable-cracklib=${LOCALBASE}/libdata/cracklib/pw_dict
+CONFIGURE_ARGS+=	--enable-cracklib=${LOCALBASE}/libdata/cracklib/cracklib-words
 CFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib -lcrack
 .endif
Index: mail/qmailadmin/files/cracklib.patch
===================================================================
--- mail/qmailadmin/files/cracklib.patch	(revision 423112)
+++ mail/qmailadmin/files/cracklib.patch	(working copy)
@@ -24,7 +24,7 @@
 +
 +if test "$cracklib" = "yes"
 +then
-+	cracklib="/usr/local/libdata/cracklib/pw_dict"
++	cracklib="/usr/local/libdata/cracklib/cracklib-words"
 +fi
 +
 +case $cracklib in
Index: security/heimdal/files/kpasswdd-cracklib.c
===================================================================
--- security/heimdal/files/kpasswdd-cracklib.c	(revision 423112)
+++ security/heimdal/files/kpasswdd-cracklib.c	(working copy)
@@ -16,7 +16,7 @@
 				return "out of memory";
 		memcpy(p, password->data, password->length);
 		p[password->length] = '\0';
-		result = FascistCheck(p, LOCALBASE "/libdata/cracklib/pw_dict");
+		result = FascistCheck(p, LOCALBASE "/libdata/cracklib/cracklib-words");
 		free(p);
 		return result;
 }
Index: security/p5-Crypt-Cracklib/Makefile
===================================================================
--- security/p5-Crypt-Cracklib/Makefile	(revision 423112)
+++ security/p5-Crypt-Cracklib/Makefile	(working copy)
@@ -20,7 +20,7 @@
 
 USES=		perl5
 USE_PERL5=	configure
-CONFIGURE_ARGS=	INC="-I${LOCALBASE}/include" DEFINE="-DCRACKLIB_DICTPATH=\\\"${PREFIX}/libdata/cracklib/pw_dict\\\""
+CONFIGURE_ARGS=	INC="-I${LOCALBASE}/include" DEFINE="-DCRACKLIB_DICTPATH=\\\"${PREFIX}/libdata/cracklib/cracklib-words\\\""
 
 post-patch:
 	@${REINPLACE_CMD} 's/-Werror//' ${WRKSRC}/Makefile.PL
Index: security/pecl-crack/Makefile
===================================================================
--- security/pecl-crack/Makefile	(revision 423112)
+++ security/pecl-crack/Makefile	(working copy)
@@ -25,7 +25,7 @@
 CFLAGS+=	-Wno-deprecated
 
 post-configure:
-	${REINPLACE_CMD} -e 's|^\$$ini_overwrites.*|&'"'"'crack.default_dictionary=\"${LOCALBASE}/libdata/cracklib/pw_dict\"'"'"',|' \
+	${REINPLACE_CMD} -e 's|^\$$ini_overwrites.*|&'"'"'crack.default_dictionary=\"${LOCALBASE}/libdata/cracklib/cracklib-words\"'"'"',|' \
 		${WRKSRC}/run-tests.php
 
 test check regression-test: build
Index: security/revelation/Makefile
===================================================================
--- security/revelation/Makefile	(revision 423112)
+++ security/revelation/Makefile	(working copy)
@@ -31,7 +31,7 @@
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-DICTPATH=	${LOCALBASE}/libdata/cracklib/pw_dict
+DICTPATH=	${LOCALBASE}/libdata/cracklib/cracklib-words
 
 post-patch:
 	@${REINPLACE_CMD} -e \