diff --git a/security/fprintd/Makefile b/security/fprintd/Makefile
index bc2500afb92f..3201897aedb9 100644
--- a/security/fprintd/Makefile
+++ b/security/fprintd/Makefile
@@ -1,27 +1,49 @@
 # $FreeBSD$
 
 PORTNAME=	fprintd
-PORTVERSION=	0.6.0
+PORTVERSION=	0.8.1
 CATEGORIES=	security
-MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
 MAINTAINER=	la5lbtyi@aon.at
 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
 
-GNU_CONFIGURE=	yes
-USES=		tar:xz gmake libtool pkgconfig
+USES=		autoreconf:build gettext gmake gnome libtool pkgconfig
 USE_GNOME=	intltool glib20
 
-OPTIONS_DEFINE=	NLS
+USE_GITHUB=	yes
+GH_ACCOUNT=	freedesktop
+GH_PROJECT=	libfprint-${PORTNAME}
+GH_TAGNAME=	V_${PORTVERSION:S|.|_|g}
+
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+MAKE_ARGS=	sysconfdir="${ETCDIR}/" mandir="${MANDIRS}"
+
+OPTIONS_DEFINE=	NLS PAM
 OPTIONS_SUB=	yes
 
-NLS_USES=		gettext
 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
 
 .include <bsd.port.mk>
diff --git a/security/fprintd/distinfo b/security/fprintd/distinfo
index b3759e53f56b..285f588f1949 100644
--- a/security/fprintd/distinfo
+++ b/security/fprintd/distinfo
@@ -1,2 +1,3 @@
-SHA256 (fprintd-0.6.0.tar.xz) = 3f5462eeb4917d2f74925b904ceb2668c011b732d84fb1c5679f4f9ce9b6c6af
-SIZE (fprintd-0.6.0.tar.xz) = 287964
+TIMESTAMP = 1535860241
+SHA256 (freedesktop-libfprint-fprintd-0.8.1-V_0_8_1_GH0.tar.gz) = 7370e500ad9228194c575f915e215668d5d42958decc0485024f8dbfd646d21a
+SIZE (freedesktop-libfprint-fprintd-0.8.1-V_0_8_1_GH0.tar.gz) = 92276
diff --git a/security/fprintd/files/patch-pam-Makefile.in b/security/fprintd/files/patch-pam-Makefile.in
deleted file mode 100644
index 8659532554da..000000000000
--- a/security/fprintd/files/patch-pam-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./pam/Makefile.in.ORIG	2013-08-11 18:21:32.000000000 +0200
-+++ ./pam/Makefile.in	2014-04-21 15:40:09.000000000 +0200
-@@ -364,7 +364,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @HAVE_PAM_TRUE@pammod_LTLIBRARIES = pam_fprintd.la
--@HAVE_PAM_TRUE@pammoddir = $(libdir)/security
-+@HAVE_PAM_TRUE@pammoddir = $(libdir)
- @HAVE_PAM_TRUE@pam_fprintd_la_SOURCES = pam_fprintd.c $(MARSHALFILES)
- @HAVE_PAM_TRUE@pam_fprintd_la_CFLAGS = -fPIC $(WARN_CFLAGS) $(GLIB_CFLAGS) -DLOCALEDIR="\"$(localedir)\""
- @HAVE_PAM_TRUE@pam_fprintd_la_LDFLAGS = -avoid-version -module -Wl,-z,nodelete
diff --git a/security/fprintd/files/patch-po-Makefile.in.in b/security/fprintd/files/patch-po-Makefile.in.in
deleted file mode 100644
index 1b4c0b5c2606..000000000000
--- a/security/fprintd/files/patch-po-Makefile.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./po/Makefile.in.in.ORIG	2013-08-11 17:56:10.000000000 +0200
-+++ ./po/Makefile.in.in	2014-04-21 15:36:34.000000000 +0200
-@@ -34,7 +34,7 @@
- datarootdir = @datarootdir@
- libdir = @libdir@
- DATADIRNAME = @DATADIRNAME@
--itlocaledir = $(prefix)/$(DATADIRNAME)/locale
-+itlocaledir = @localedir@
- subdir = po
- install_sh = @install_sh@
- # Automake >= 1.8 provides @mkdir_p@.
diff --git a/security/fprintd/pkg-plist b/security/fprintd/pkg-plist
index 770ae495d2bd..e0c1f86bf4d2 100644
--- a/security/fprintd/pkg-plist
+++ b/security/fprintd/pkg-plist
@@ -2,58 +2,84 @@ bin/fprintd-delete
 bin/fprintd-enroll
 bin/fprintd-list
 bin/fprintd-verify
-etc/dbus-1/system.d/net.reactivated.Fprint.conf
-etc/fprintd.conf
-lib/pam_fprintd.a
-lib/pam_fprintd.so
+%%ETCDIR%%/dbus-1/system.d/net.reactivated.Fprint.conf
+%%ETCDIR%%/fprintd.conf
+lib/security/pam_fprintd.a
+lib/security/pam_fprintd.so
 libexec/fprintd
-man/man1/fprintd.1.gz
 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/bg_BG/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/fa_IR/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
+man/man1/fprintd.1.gz
 share/polkit-1/actions/net.reactivated.fprint.device.policy