diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile
index 2d6591b0ecc1..03812ec61231 100644
--- a/security/fprintd/Makefile
+++ b/security/fprintd/Makefile
@@ -1,47 +1,42 @@
 PORTNAME=	fprintd
 DISTVERSIONPREFIX=	V_
 DISTVERSION=	0_8_1
 CATEGORIES=	security
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon that provides fingerprint scanning functionality over D-Bus
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfprint.so:security/libfprint \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
 		libpolkit-gobject-1.so:sysutils/polkit
 
 USES=		autoreconf:build gettext gmake gnome libtool pkgconfig
 USE_GNOME=	intltool glib20
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freedesktop
 GH_PROJECT=	libfprint-${PORTNAME}
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 MAKE_ARGS=	sysconfdir="${ETCDIR}/"
 
 OPTIONS_DEFINE=	NLS PAM
 OPTIONS_SUB=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 PAM_CONFIGURE_ENABLE=	pam
 
-do-configure:
-	(cd ${WRKSRC} ; ${SH} autogen.sh)
-
 # Remove doc build ;  Doesn't install with/without
 # Also less deps needed
 pre-configure:
 	${REINPLACE_CMD} -e '/pushd/d ; /docize/d ; /popd/d' ${WRKSRC}/autogen.sh
 	${REINPLACE_CMD} -e '73,81d' ${WRKSRC}/doc/Makefile.am
 	${REINPLACE_CMD} -e '/DOC_CHECK/d' ${WRKSRC}/configure.ac
-
-post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/security/pam_fprintd.so
+	(cd ${WRKSRC} && ${SETENV} NOCONFIGURE=1 ${SH} autogen.sh)
 
 .include <bsd.port.mk>
diff --git a/security/fprintd/pkg-plist b/security/fprintd/pkg-plist
index be2cca9b31f7..4e3a01d8bd40 100644
--- a/security/fprintd/pkg-plist
+++ b/security/fprintd/pkg-plist
@@ -1,85 +1,85 @@
 bin/fprintd-delete
 bin/fprintd-enroll
 bin/fprintd-list
 bin/fprintd-verify
 %%ETCDIR%%/dbus-1/system.d/net.reactivated.Fprint.conf
 %%ETCDIR%%/fprintd.conf
-lib/security/pam_fprintd.a
-lib/security/pam_fprintd.so
+%%PAM%%lib/security/pam_fprintd.a
+%%PAM%%lib/security/pam_fprintd.so
 libexec/fprintd
 share/dbus-1/interfaces/net.reactivated.Fprint.Device.xml
 share/dbus-1/interfaces/net.reactivated.Fprint.Manager.xml
 share/dbus-1/system-services/net.reactivated.Fprint.service
 %%NLS%%share/locale/ar/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/as/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/az/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/be/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/bn_IN/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/cy/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/da/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/de/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/el/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/eo/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/es/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/et/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/fo/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/fur/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/gu/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/he/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/hi/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ia/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/id/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/it/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ka/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/kk/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/kn/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/lv/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ml/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/mr/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ms/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/nn/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/oc/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/or/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/pa/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/pt/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/sl/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/sq/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/sr@latin/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/ta/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/te/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/th/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/wa/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/fprintd.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/fprintd.mo
-share/man/man1/fprintd.1.gz
+man/man1/fprintd.1.gz
 share/polkit-1/actions/net.reactivated.fprint.device.policy