diff --git a/print/xournal/Makefile b/print/xournal/Makefile
index 444c92f11df..953992d154d 100644
--- a/print/xournal/Makefile
+++ b/print/xournal/Makefile
@@ -1,18 +1,18 @@
 COMMENT =		application for notetaking & annotating PDF files
-DISTNAME =		xournal-0.4.8
+DISTNAME =		xournal-0.4.8.2016
 CATEGORIES =		print
-REVISION =		5
 
 HOMEPAGE =		http://xournal.sourceforge.net/
 
 # GPLv2+
 PERMIT_PACKAGE =	Yes
 
-WANTLIB =  X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xrandr
-WANTLIB += Xrender art_lgpl_2 atk-1.0 c cairo fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gnomecanvas-2
-WANTLIB += gobject-2.0 gtk-x11-2.0 harfbuzz iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 poppler-glib pthread z
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender art_lgpl_2 atk-1.0 c cairo fontconfig
+WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gnomecanvas-2 gobject-2.0 gtk-x11-2.0 harfbuzz intl
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 poppler-glib
+WANTLIB += z
 
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=xournal/}
 
@@ -25,7 +25,7 @@ RUN_DEPENDS = 		devel/desktop-file-utils \
 			x11/gtk+3,-guic
 
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include -DHAVE_UNISTD_H=1" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 INSTALL_TARGET =	install desktop-install
diff --git a/print/xournal/distinfo b/print/xournal/distinfo
index 3642f439014..f47f955a7b5 100644
--- a/print/xournal/distinfo
+++ b/print/xournal/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xournal-0.4.8.tar.gz) = IziHo4E2RS3LRlLDXQg2b8c1X1ftRnU9uD4+DzGT7zA=
-SIZE (xournal-0.4.8.tar.gz) = 641240
+SHA256 (xournal-0.4.8.2016.tar.gz) = sliY29ehSVB/N6FnaSAtafvr1KAA12aSO70yxcdGKCY=
+SIZE (xournal-0.4.8.2016.tar.gz) = 646082
diff --git a/print/xournal/patches/patch-Makefile_in b/print/xournal/patches/patch-Makefile_in
index fe6f2adad20..063c0aabdae 100644
--- a/print/xournal/patches/patch-Makefile_in
+++ b/print/xournal/patches/patch-Makefile_in
@@ -1,6 +1,7 @@
---- Makefile.in.orig	Sun Jun 29 07:53:20 2014
-+++ Makefile.in	Tue Jul  8 16:24:52 2014
-@@ -820,7 +820,7 @@ desktop-install:
+endex: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -840,7 +840,7 @@ desktop-install:
  	$(mkinstalldirs) $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
  	$(mkinstalldirs) $(DESTDIR)$$desktopdir/mime/packages; \
  	$(mkinstalldirs) $(DESTDIR)$$desktopdir/applications; \
@@ -9,7 +10,7 @@
  	$(INSTALL_DATA) $(srcdir)/pixmaps/xournal.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/apps; \
  	$(INSTALL_DATA) $(srcdir)/pixmaps/xoj.svg $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes; \
  	if test ! -e $(DESTDIR)$$desktopdir/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg; then \
-@@ -828,7 +828,7 @@ desktop-install:
+@@ -851,7 +851,7 @@ desktop-install:
  	fi; \
  	$(INSTALL_DATA) $(srcdir)/xournal.xml $(DESTDIR)$$desktopdir/mime/packages; \
  	$(INSTALL_DATA) $(srcdir)/xournal.desktop $(DESTDIR)$$desktopdir/applications; \
diff --git a/print/xournal/pkg/PLIST b/print/xournal/pkg/PLIST
index 9a97493defa..ec3c3e6ff2f 100644
--- a/print/xournal/pkg/PLIST
+++ b/print/xournal/pkg/PLIST
@@ -5,6 +5,7 @@ share/doc/xournal/manual.html
 share/doc/xournal/pixmaps
 share/doc/xournal/screenshot.png
 share/icons/hicolor/scalable/apps/xournal.svg
+share/icons/hicolor/scalable/mimetypes/application-x-xoj.svg
 share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xoj.svg
 share/icons/hicolor/scalable/mimetypes/xoj.svg
 share/locale/ca/LC_MESSAGES/xournal.mo