diff --git a/security/pam_krb5-rh/Makefile b/security/pam_krb5-rh/Makefile
index 47502007afa9..5d5e7867614c 100644
--- a/security/pam_krb5-rh/Makefile
+++ b/security/pam_krb5-rh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pam_krb5
 DISTVERSION=	2.4.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://fedorahosted.org/released/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -16,26 +17,19 @@ LICENSE_COMB=	dual
 
 CONFLICTS=	pam_krb5-4.*
 
-USES=		iconv
+USES=		iconv libtool
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG} --without-afs \
-		--with-libintl-prefix=${LOCALBASE} --with-krb4=no \
-		--without-keyutils
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--without-afs --without-keyutils --without-krb4
+CPPFLAGS+=	-I${LOCALBASE}/include
+LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
-LDFLAGS+=	-lintl
-USES+=		gettext
-.else
-PLIST_SUB+=	NLS="@comment "
-CONFIGURE_ARGS+=--disable-nls
-.endif
+NLS_CONFIGURE_ENABLE=	nls
+NLS_LIBS=	-lintl
+NLS_USES=	gettext
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|libdir)/security|libdir)|g' ${WRKSRC}/src/Makefile.in
diff --git a/security/pam_krb5-rh/pkg-plist b/security/pam_krb5-rh/pkg-plist
index c76013453ea6..85cd84acdd4d 100644
--- a/security/pam_krb5-rh/pkg-plist
+++ b/security/pam_krb5-rh/pkg-plist
@@ -1,7 +1,9 @@
 lib/pam_krb5/pam_krb5_cchelper
-lib/pam_krb5.so
-lib/pam_krb5.la
 @dirrm lib/pam_krb5
+lib/pam_krb5.so
+man/man5/pam_krb5.5.gz
+man/man8/pam_krb5.8.gz
+man/man8/pam_krb5_cchelper.8.gz
 %%NLS%%share/locale/as/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/bn_IN/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/pam_krb5.mo
@@ -37,9 +39,6 @@ lib/pam_krb5.la
 %%NLS%%share/locale/uk/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/pam_krb5.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/pam_krb5.mo
-man/man5/pam_krb5.5.gz
-man/man8/pam_krb5.8.gz
-man/man8/pam_krb5_cchelper.8.gz
 %%NLS%%@dirrmtry share/locale/as/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/bn_IN/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/mr/LC_MESSAGES