diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index e6efb06d60d0..e3105e39e23e 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -1,86 +1,87 @@
 PORTNAME=	zbar
 DISTVERSION=	0.23.90
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	https://linuxtv.org/downloads/zbar/
 
 MAINTAINER=	dev2@heesakkers.info
 COMMENT=	ZBar barcode reader
 WWW=		https://github.com/mchehab/zbar/
 
 LICENSE=	LGPL21
 
 USES=		autoreconf gettext-tools gmake iconv libtool localbase:ldflags pathfix pkgconfig
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--without-java --without-npapi --without-python \
 		--enable-codes=ean,databar,code128,code93,code39,codabar,i25,qrcode,sqcode,pdf417
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=			DBUS DOCS GIR JPEG NLS QT5 V4L X11
 OPTIONS_DEFAULT=		GTK_NONE IMAGEMAGICK JPEG NLS X11
 OPTIONS_RADIO=			MAGICK
 OPTIONS_RADIO_MAGICK=		GRAPHICSMAGICK IMAGEMAGICK
 OPTIONS_SINGLE=			GTK
 OPTIONS_SINGLE_GTK=		GTK2 GTK3 GTK_NONE
 OPTIONS_SUB=			yes
 
 GIR_DESC=			Build Gobject Introspection
 GTK_DESC=			GTK support
 GTK_NONE_DESC=			Build without GTK support
 GRAPHICSMAGICK_DESC=		GraphicsMagick image processing support
 MAGICK_DESC=			*Magick image processing support
 V4L_DESC=			Build zbarcam video scanner
 
 DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=		dbus
 
 DOCS_BUILD_DEPENDS=		xmlto:textproc/xmlto
 DOCS_CONFIGURE_ENABLE=		doc
 
 GIR_USES=			gnome
 GIR_USE=			GNOME=introspection:build
 GIR_CONFIGURE_WITH=		gir
 
 GTK2_USES=			gnome gettext-runtime
 GTK2_USE=			GNOME=atk,cairo,gdkpixbuf2,glib20,gtk20,pango
 GTK2_LIB_DEPENDS=		libfreetype.so:print/freetype2 \
 				libfontconfig.so:x11-fonts/fontconfig
 GTK2_CONFIGURE_ON=		--with-gtk=gtk2
 
 GTK3_USES=			gnome gettext-runtime
 GTK3_USE=			GNOME=atk,cairo,gdkpixbuf2,glib20,gtk30,pango
 GTK3_CONFIGURE_ON=		--with-gtk=gtk3
 
 GTK_NONE_CONFIGURE_ON=		--with-gtk=no
 
 GRAPHICSMAGICK_LIB_DEPENDS=	libGraphicsMagickWand.so:graphics/GraphicsMagick
 GRAPHICSMAGICK_CONFIGURE_WITH=	graphicsmagick
 
 IMAGEMAGICK_USES=		magick
 IMAGEMAGICK_CONFIGURE_WITH=	imagemagick
 
 JPEG_USES=			jpeg
 JPEG_CONFIGURE_WITH=		jpeg
 
 NLS_USES=			gettext-runtime
 NLS_LDFLAGS=			-lintl
 NLS_CONFIGURE_ENABLE=		nls
 
 QT5_USES=			qt:5
 QT5_USE=			QT=core,gui,widgets,x11extras,buildtools:build
 QT5_CONFIGURE_WITH=		qt qt5
 QT5_IMPLIES=			X11
 
 V4L_BUILD_DEPENDS=		v4l_compat>=1.0.20101027:multimedia/v4l_compat
 V4L_LIB_DEPENDS=		libv4l2.so:multimedia/libv4l
 V4L_CONFIGURE_ENABLE=		video
 
 X11_USES=			xorg
 X11_USE=			XORG=ice,sm,x11,xau,xcb,xdmcp,xext,xv
 X11_CONFIGURE_ON=		--with-x --with-xv --with-xshm
 X11_CONFIGURE_OFF=		--without-x --without-xshm --without-xv
 
 .include <bsd.port.mk>
diff --git a/graphics/zbar/pkg-plist b/graphics/zbar/pkg-plist
index b10df114a2d7..392b39c17503 100644
--- a/graphics/zbar/pkg-plist
+++ b/graphics/zbar/pkg-plist
@@ -1,55 +1,55 @@
 %%V4L%%bin/zbarcam
 %%V4L%%%%GTK2%%bin/zbarcam-gtk
 %%V4L%%%%GTK3%%bin/zbarcam-gtk
 %%V4L%%%%QT5%%bin/zbarcam-qt
 %%GRAPHICSMAGICK%%bin/zbarimg
 %%IMAGEMAGICK%%bin/zbarimg
 %%DBUS%%etc/dbus-1/system.d/org.linuxtv.Zbar.conf
 include/zbar.h
 include/zbar/Decoder.h
 include/zbar/Exception.h
 include/zbar/Image.h
 include/zbar/ImageScanner.h
 include/zbar/Processor.h
 %%QT5%%include/zbar/QZBar.h
 %%QT5%%include/zbar/QZBarImage.h
 include/zbar/Scanner.h
 include/zbar/Symbol.h
 include/zbar/Video.h
 include/zbar/Window.h
 %%GTK2%%include/zbar/zbargtk.h
 %%GTK3%%include/zbar/zbargtk.h
 lib/libzbar.a
 lib/libzbar.so
 lib/libzbar.so.0
 lib/libzbar.so.0.3.0
 %%QT5%%lib/libzbarqt.a
 %%QT5%%lib/libzbarqt.so
 %%QT5%%lib/libzbarqt.so.0
 %%QT5%%lib/libzbarqt.so.0.1.2
 %%GIR%%lib/girepository-1.0/ZBar-1.0.typelib
 %%GTK2%%lib/libzbargtk.a
 %%GTK3%%lib/libzbargtk.a
 %%GTK2%%lib/libzbargtk.so
 %%GTK3%%lib/libzbargtk.so
 %%GTK2%%lib/libzbargtk.so.0
 %%GTK3%%lib/libzbargtk.so.0
 %%GTK2%%lib/libzbargtk.so.0.0.2
 %%GTK3%%lib/libzbargtk.so.0.0.2
 %%GTK2%%libdata/pkgconfig/zbar-gtk.pc
 %%GTK3%%libdata/pkgconfig/zbar-gtk.pc
 %%QT5%%libdata/pkgconfig/zbar-qt.pc
 libdata/pkgconfig/zbar.pc
-%%DOCS%%%%V4L%%man/man1/zbarcam.1.gz
-%%DOCS%%%%GRAPHICSMAGICK%%man/man1/zbarimg.1.gz
-%%DOCS%%%%IMAGEMAGICK%%man/man1/zbarimg.1.gz
+%%DOCS%%%%V4L%%share/man/man1/zbarcam.1.gz
+%%DOCS%%%%GRAPHICSMAGICK%%share/man/man1/zbarimg.1.gz
+%%DOCS%%%%IMAGEMAGICK%%share/man/man1/zbarimg.1.gz
 %%GIR%%share/gir-1.0/ZBar-1.0.gir
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/zbar.mo
 %%NLS%%%%PORTDOCS%%%%DOCSDIR%%/ABOUT-NLS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/HACKING.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.md
 %%PORTDOCS%%%%DOCSDIR%%/NEWS.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/TODO.md