diff --git a/print/deforaos-pdfviewer/Makefile b/print/deforaos-pdfviewer/Makefile
index c3d6efe89d27..843607313e39 100644
--- a/print/deforaos-pdfviewer/Makefile
+++ b/print/deforaos-pdfviewer/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	pdfviewer
-PORTVERSION=	0.0.1
-PORTREVISION=	9
+PORTVERSION=	0.0.2
 CATEGORIES=	print
-MASTER_SITES=	http://www.defora.org/os/download/download/3686/
+MASTER_SITES=	http://www.defora.org/os/download/download/4431/
 PKGNAMEPREFIX=	deforaos-
 DISTNAME=	PDFViewer-${PORTVERSION}
 
@@ -16,12 +15,35 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	libSystem.so:devel/deforaos-libsystem \
 		libDesktop.so:x11/deforaos-libdesktop \
-		libpoppler-glib.so:graphics/poppler-glib
+		libpoppler-glib.so:graphics/poppler-glib \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
 
 MAKE_ARGS+=	PREFIX=${PREFIX}
 USES=		desktop-file-utils pkgconfig
-USE_GNOME=	gtk20
-PLIST_FILES=	bin/pdfviewer \
-		share/applications/pdfviewer.desktop
+USE_GNOME=	gtk20 gdkpixbuf2 cairo
+MAKE_ENV+=	MANDIR=${STAGEDIR}${MANPREFIX}/man
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
+	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
+
+post-patch-DOCS-off:
+	${REINPLACE_CMD} 's|data doc po|data po|' \
+		${WRKSRC}/Makefile
+
+post-patch-NLS-off:
+	${REINPLACE_CMD} 's|po src tools|src tools|' \
+		${WRKSRC}/Makefile
+
+post-patch:
+	@${REINPLACE_CMD} 's|-Wl,-pie||g' \
+		${WRKSRC}/tools/Makefile \
+		${WRKSRC}/src/Makefile
+
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/pdfviewer
 
 .include <bsd.port.mk>
diff --git a/print/deforaos-pdfviewer/distinfo b/print/deforaos-pdfviewer/distinfo
index 9adfdb135672..8787bc0ff1f9 100644
--- a/print/deforaos-pdfviewer/distinfo
+++ b/print/deforaos-pdfviewer/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PDFViewer-0.0.1.tar.gz) = a2fcb65413d6ee9955792e27cc9f5a9e784b0ad19d68760fc9d8e9fa42bb77c5
-SIZE (PDFViewer-0.0.1.tar.gz) = 20405
+TIMESTAMP = 1484322430
+SHA256 (PDFViewer-0.0.2.tar.gz) = f02c587f0aefbd2d7f681543938b55dfa8a53728d59087407e664c827e50c004
+SIZE (PDFViewer-0.0.2.tar.gz) = 28788
diff --git a/print/deforaos-pdfviewer/files/patch-doc_Makefile b/print/deforaos-pdfviewer/files/patch-doc_Makefile
new file mode 100644
index 000000000000..ed1ad9cea75f
--- /dev/null
+++ b/print/deforaos-pdfviewer/files/patch-doc_Makefile
@@ -0,0 +1,27 @@
+--- doc/Makefile.orig	2017-01-13 17:04:41 UTC
++++ doc/Makefile
+@@ -1,4 +1,4 @@
+-TARGETS	= $(OBJDIR)pdfviewer.1 $(OBJDIR)pdfviewer.html $(OBJDIR)pdfviewer.xml
++TARGETS	= $(OBJDIR)pdfviewer.1 $(OBJDIR)pdfviewer.xml
+ OBJDIR	=
+ PREFIX	= /usr/local
+ DESTDIR	=
+@@ -22,7 +22,6 @@ $(OBJDIR)pdfviewer.xml: pdfviewer.xml.in
+ clean:
+ 	$(RM) -- $(pdfviewer.1_OBJS) $(pdfviewer.html_OBJS) $(pdfviewer.xml_OBJS)
+ 	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pdfviewer.1"
+-	./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pdfviewer.html"
+ 	../tools/subst.sh -c -P "$(PREFIX)" -- "$(OBJDIR)pdfviewer.xml"
+ 
+ distclean: clean
+@@ -30,10 +29,8 @@ distclean: clean
+ 
+ install: $(TARGETS)
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)pdfviewer.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)pdfviewer.html"
+ 
+ uninstall:
+ 	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "pdfviewer.1"
+-	./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "pdfviewer.html"
+ 
+ .PHONY: all clean distclean install uninstall
diff --git a/print/deforaos-pdfviewer/pkg-plist b/print/deforaos-pdfviewer/pkg-plist
new file mode 100644
index 000000000000..756c65bf0cd1
--- /dev/null
+++ b/print/deforaos-pdfviewer/pkg-plist
@@ -0,0 +1,5 @@
+bin/pdfviewer
+share/applications/deforaos-pdfviewer.desktop
+%%NLS%%share/locale/es/LC_MESSAGES/PDFViewer.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/PDFViewer.mo
+%%PORTDOCS%%man/man1/pdfviewer.1.gz