diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index 9d51df160803..b7735ae40ef4 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmailadmin
 PORTVERSION=	1.2.15
-PORTREVISION=	7
+PORTREVISION=	8
 PORTEPOCH=	2
 CATEGORIES=	mail www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \
@@ -86,7 +86,7 @@ CONFIGURE_ARGS+=	--enable-spam-command="${SPAM_COMMAND}"
 .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
diff --git a/mail/qmailadmin/files/cracklib.patch b/mail/qmailadmin/files/cracklib.patch
index 81fe28a1fbe4..e9ebef107ebe 100644
--- a/mail/qmailadmin/files/cracklib.patch
+++ b/mail/qmailadmin/files/cracklib.patch
@@ -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