diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index c6df165e3d26..a6535a8af624 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -1,50 +1,51 @@
 PORTNAME=	xdialog
 PORTVERSION=	2.3.1
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11
 MASTER_SITES=	http://xdialog.free.fr/
 DISTNAME=	${PORTNAME:S/x/X/}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drop in replacement for the "dialog" or "cdialog" programs
 WWW=		http://xdialog.free.fr/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 LIB_DEPENDS+=	libfontconfig.so:x11-fonts/fontconfig
 LIB_DEPENDS+=	libfreetype.so:print/freetype2
 
 USES=		gnome localbase pkgconfig tar:bzip2
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-gtk2
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|m4 lib src|m4 src|g ; \
 		 s|-I../lib||g ; \
 		 s|-L../lib -lgetopt||g ; \
 		 s| install-docDATA||g'
 	@${REINPLACE_CMD} -e 's,Xdialog\\-%%version%%,xdialog,' \
 		${WRKSRC}/doc/Xdialog.man
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}${DESKTOPDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 	${INSTALL_DATA} ${PATCHDIR}/bsdconfig.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${PATCHDIR}/bsdconfig-48.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/bsdconfig.png
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/samples
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${STAGEDIR}${DOCSDIR}/samples
 
 .include <bsd.port.mk>
diff --git a/x11/xdialog/pkg-plist b/x11/xdialog/pkg-plist
index 0e2d0dc19ed1..8165a318bbec 100644
--- a/x11/xdialog/pkg-plist
+++ b/x11/xdialog/pkg-plist
@@ -1,106 +1,106 @@
 bin/Xdialog
-man/man1/Xdialog.1.gz
+share/man/man1/Xdialog.1.gz
 @dir %%DATADIR%%/usr/local/share/applications
 share/applications/bsdconfig.desktop
 share/icons/hicolor/48x48/apps/bsdconfig.png
 %%PORTDOCS%%%%DOCSDIR%%/2ranges.png
 %%PORTDOCS%%%%DOCSDIR%%/authors.html
 %%PORTDOCS%%%%DOCSDIR%%/box.html
 %%PORTDOCS%%%%DOCSDIR%%/buildlist.png
 %%PORTDOCS%%%%DOCSDIR%%/calendar.png
 %%PORTDOCS%%%%DOCSDIR%%/center.png
 %%PORTDOCS%%%%DOCSDIR%%/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/check.png
 %%PORTDOCS%%%%DOCSDIR%%/checklist.png
 %%PORTDOCS%%%%DOCSDIR%%/colorsel.png
 %%PORTDOCS%%%%DOCSDIR%%/combobox.png
 %%PORTDOCS%%%%DOCSDIR%%/common.html
 %%PORTDOCS%%%%DOCSDIR%%/compatibility.html
 %%PORTDOCS%%%%DOCSDIR%%/dselect.png
 %%PORTDOCS%%%%DOCSDIR%%/editbox.png
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/fill.png
 %%PORTDOCS%%%%DOCSDIR%%/fixedfont.png
 %%PORTDOCS%%%%DOCSDIR%%/fontsel.png
 %%PORTDOCS%%%%DOCSDIR%%/fselect.png
 %%PORTDOCS%%%%DOCSDIR%%/gauge.png
 %%PORTDOCS%%%%DOCSDIR%%/gtk.html
 %%PORTDOCS%%%%DOCSDIR%%/icon.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/infobox.png
 %%PORTDOCS%%%%DOCSDIR%%/input.png
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/labelcenter.png
 %%PORTDOCS%%%%DOCSDIR%%/labelleft.png
 %%PORTDOCS%%%%DOCSDIR%%/labelright.png
 %%PORTDOCS%%%%DOCSDIR%%/left.png
 %%PORTDOCS%%%%DOCSDIR%%/license.html
 %%PORTDOCS%%%%DOCSDIR%%/logbox.png
 %%PORTDOCS%%%%DOCSDIR%%/msgbox.png
 %%PORTDOCS%%%%DOCSDIR%%/nofixedfont.png
 %%PORTDOCS%%%%DOCSDIR%%/notags.png
 %%PORTDOCS%%%%DOCSDIR%%/password.png
 %%PORTDOCS%%%%DOCSDIR%%/radiolist.png
 %%PORTDOCS%%%%DOCSDIR%%/range.png
 %%PORTDOCS%%%%DOCSDIR%%/rcfile.png
 %%PORTDOCS%%%%DOCSDIR%%/right.png
 %%PORTDOCS%%%%DOCSDIR%%/samples/Xdialog.wrapper.c
 %%PORTDOCS%%%%DOCSDIR%%/samples/Xmessage
 %%PORTDOCS%%%%DOCSDIR%%/samples/Xmore
 %%PORTDOCS%%%%DOCSDIR%%/samples/allrpms
 %%PORTDOCS%%%%DOCSDIR%%/samples/bluebox.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/buildlist
 %%PORTDOCS%%%%DOCSDIR%%/samples/calendar
 %%PORTDOCS%%%%DOCSDIR%%/samples/chain
 %%PORTDOCS%%%%DOCSDIR%%/samples/checklist
 %%PORTDOCS%%%%DOCSDIR%%/samples/dselect
 %%PORTDOCS%%%%DOCSDIR%%/samples/editbox
 %%PORTDOCS%%%%DOCSDIR%%/samples/fixed-font.rc
 %%PORTDOCS%%%%DOCSDIR%%/samples/format1440
 %%PORTDOCS%%%%DOCSDIR%%/samples/fselect
 %%PORTDOCS%%%%DOCSDIR%%/samples/gauge
 %%PORTDOCS%%%%DOCSDIR%%/samples/infobox
 %%PORTDOCS%%%%DOCSDIR%%/samples/infobox2
 %%PORTDOCS%%%%DOCSDIR%%/samples/inputbox
 %%PORTDOCS%%%%DOCSDIR%%/samples/install-wrapper
 %%PORTDOCS%%%%DOCSDIR%%/samples/kernel
 %%PORTDOCS%%%%DOCSDIR%%/samples/logbox
 %%PORTDOCS%%%%DOCSDIR%%/samples/logbox2
 %%PORTDOCS%%%%DOCSDIR%%/samples/login
 %%PORTDOCS%%%%DOCSDIR%%/samples/menubox
 %%PORTDOCS%%%%DOCSDIR%%/samples/msgbox
 %%PORTDOCS%%%%DOCSDIR%%/samples/no-entry.xpm
 %%PORTDOCS%%%%DOCSDIR%%/samples/radiolist
 %%PORTDOCS%%%%DOCSDIR%%/samples/rangebox
 %%PORTDOCS%%%%DOCSDIR%%/samples/set-time
 %%PORTDOCS%%%%DOCSDIR%%/samples/tailbox
 %%PORTDOCS%%%%DOCSDIR%%/samples/textbox
 %%PORTDOCS%%%%DOCSDIR%%/samples/timebox
 %%PORTDOCS%%%%DOCSDIR%%/samples/treeview
 %%PORTDOCS%%%%DOCSDIR%%/samples/warning.xpm
 %%PORTDOCS%%%%DOCSDIR%%/samples/xlock-wrapper
 %%PORTDOCS%%%%DOCSDIR%%/samples/yesno
 %%PORTDOCS%%%%DOCSDIR%%/special.html
 %%PORTDOCS%%%%DOCSDIR%%/spinbox.png
 %%PORTDOCS%%%%DOCSDIR%%/syntax.html
 %%PORTDOCS%%%%DOCSDIR%%/tailbox.png
 %%PORTDOCS%%%%DOCSDIR%%/timebox.png
 %%PORTDOCS%%%%DOCSDIR%%/title.png
 %%PORTDOCS%%%%DOCSDIR%%/transient.html
 %%PORTDOCS%%%%DOCSDIR%%/treeview.png
 %%PORTDOCS%%%%DOCSDIR%%/withtags.png
 %%PORTDOCS%%%%DOCSDIR%%/yesno-wizard.png
 %%PORTDOCS%%%%DOCSDIR%%/yesno.png
 %%NLS%%share/locale/ca/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/de/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/es/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/id/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/it/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/no_NO/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/Xdialog.mo
 %%NLS%%share/locale/sv_SE/LC_MESSAGES/Xdialog.mo