diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index 687b8412b8b2..185f91beda0c 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	xneur
 PORTVERSION=	0.20.0
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=.orig
 CATEGORIES=	deskutils
 MASTER_SITES=	https://launchpad.net/~andrew-crew-kuznetsov/+archive/xneur-stable/+files/
 DISTNAME=	${PORTNAME}_${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	mizhka@gmail.com
 COMMENT=	Auto keyboard switcher
 WWW=		https://launchpad.net/xneur
 
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	intltool-update:textproc/intltool
 LIB_DEPENDS=	libnotify.so:devel/libnotify \
 		libpcre.so:devel/pcre
 
 USES=		compiler:nestedfct gnome iconv libtool localbase pathfix \
 		pkgconfig xorg
 USE_GNOME=	gtk20
 
 USE_XORG=	xtst
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur --with-gtk=gtk2
 
 USE_LDCONFIG=	${PREFIX}/lib/xneur ${PREFIX}/lib/xneur/xneur
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	ASPELL XOSD NLS X11 SOUND
 OPTIONS_DEFAULT=	GSTREAMER ASPELL SOUND
 XOSD_DESC=	Xosd support
 
 OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 X11_USES=		xorg
 X11_USE=		XORG=x11
 X11_CONFIGURE_WITH=	x
 
 ASPELL_LIB_DEPENDS=	libaspell.so:textproc/aspell
 ASPELL_CONFIGURE_ON=	--with-spell=aspell
 ASPELL_CONFIGURE_OFF=	--with-spell=no --without-aspell
 
 XOSD_LIB_DEPENDS=	libxosd.so:misc/xosd
 XOSD_CONFIGURE_WITH=	xosd
 SOUND_USES=	openal:al,alut
 SOUND_CONFIGURE_ON=	--with-sound=openal
 SOUND_CONFIGURE_OFF=	--with-sound=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,-Werror,,g; s,-ldl,,g' ${WRKSRC}/configure
 	@${MV} ${WRKSRC}/etc/xneurrc ${WRKSRC}/etc/xneurrc.sample
 
 .include <bsd.port.mk>
diff --git a/deskutils/xneur/pkg-plist b/deskutils/xneur/pkg-plist
index c16acafb4784..d6628968a374 100644
--- a/deskutils/xneur/pkg-plist
+++ b/deskutils/xneur/pkg-plist
@@ -1,97 +1,97 @@
 bin/xneur
 @sample %%ETCDIR%%/xneurrc.sample
 include/xneur/list_char.h
 include/xneur/xnconfig.h
 include/xneur/xneur.h
 lib/xneur/libxnconfig.so
 lib/xneur/libxnconfig.so.20
 lib/xneur/libxnconfig.so.20.0.0
 lib/xneur/libxneur.so
 lib/xneur/libxneur.so.20
 lib/xneur/libxneur.so.20.0.0
 lib/xneur/xneur/libxnstatistic.so
 lib/xneur/xneur/libxnstatistic.so.0
 lib/xneur/xneur/libxnstatistic.so.0.0.0
 lib/xneur/xneur/libxntest.so
 lib/xneur/xneur/libxntest.so.0
 lib/xneur/xneur/libxntest.so.0.0.0
 libdata/pkgconfig/xnconfig.pc
 libdata/pkgconfig/xneur.pc
-man/man1/xneur.1.gz
-man/man5/xneurrc.5.gz
+share/man/man1/xneur.1.gz
+share/man/man5/xneurrc.5.gz
 share/icons/hicolor/16x16/apps/xneur.png
 share/icons/hicolor/22x22/apps/xneur.png
 share/icons/hicolor/24x24/apps/xneur.png
 share/icons/hicolor/32x32/apps/xneur.png
 share/icons/hicolor/48x48/apps/xneur.png
 share/icons/hicolor/scalable/apps/xneur.svg
 %%DATADIR%%/languages/am/dictionary
 %%DATADIR%%/languages/am/proto
 %%DATADIR%%/languages/am/proto3
 %%DATADIR%%/languages/bg/dictionary
 %%DATADIR%%/languages/bg/proto
 %%DATADIR%%/languages/bg/proto3
 %%DATADIR%%/languages/by/dictionary
 %%DATADIR%%/languages/by/proto
 %%DATADIR%%/languages/by/proto3
 %%DATADIR%%/languages/cz/dictionary
 %%DATADIR%%/languages/cz/proto
 %%DATADIR%%/languages/cz/proto3
 %%DATADIR%%/languages/de/dictionary
 %%DATADIR%%/languages/de/proto
 %%DATADIR%%/languages/de/proto3
 %%DATADIR%%/languages/ee/dictionary
 %%DATADIR%%/languages/ee/proto
 %%DATADIR%%/languages/ee/proto3
 %%DATADIR%%/languages/en/dictionary
 %%DATADIR%%/languages/en/proto
 %%DATADIR%%/languages/en/proto3
 %%DATADIR%%/languages/es/dictionary
 %%DATADIR%%/languages/es/proto
 %%DATADIR%%/languages/es/proto3
 %%DATADIR%%/languages/fr/dictionary
 %%DATADIR%%/languages/fr/proto
 %%DATADIR%%/languages/fr/proto3
 %%DATADIR%%/languages/gb/dictionary
 %%DATADIR%%/languages/gb/proto
 %%DATADIR%%/languages/gb/proto3
 %%DATADIR%%/languages/ge/dictionary
 %%DATADIR%%/languages/ge/proto
 %%DATADIR%%/languages/ge/proto3
 %%DATADIR%%/languages/gr/dictionary
 %%DATADIR%%/languages/gr/proto
 %%DATADIR%%/languages/gr/proto3
 %%DATADIR%%/languages/kz/dictionary
 %%DATADIR%%/languages/kz/proto
 %%DATADIR%%/languages/kz/proto3
 %%DATADIR%%/languages/lt/dictionary
 %%DATADIR%%/languages/lt/proto
 %%DATADIR%%/languages/lt/proto3
 %%DATADIR%%/languages/lv/dictionary
 %%DATADIR%%/languages/lv/proto
 %%DATADIR%%/languages/lv/proto3
 %%DATADIR%%/languages/pl/dictionary
 %%DATADIR%%/languages/pl/proto
 %%DATADIR%%/languages/pl/proto3
 %%DATADIR%%/languages/ro/dictionary
 %%DATADIR%%/languages/ro/proto
 %%DATADIR%%/languages/ro/proto3
 %%DATADIR%%/languages/ru/dictionary
 %%DATADIR%%/languages/ru/proto
 %%DATADIR%%/languages/ru/proto3
 %%DATADIR%%/languages/ua/dictionary
 %%DATADIR%%/languages/ua/proto
 %%DATADIR%%/languages/ua/proto3
 %%DATADIR%%/languages/us/dictionary
 %%DATADIR%%/languages/us/proto
 %%DATADIR%%/languages/us/proto3
 %%DATADIR%%/languages/uz/dictionary
 %%DATADIR%%/languages/uz/proto
 %%DATADIR%%/languages/uz/proto3
 %%DATADIR%%/sounds/itemback.wav
 %%DATADIR%%/sounds/layout1.wav
 %%DATADIR%%/sounds/layout1type.wav
 %%DATADIR%%/sounds/layout2.wav
 %%DATADIR%%/sounds/layout2type.wav
 %%DATADIR%%/sounds/replace.wav
 %%DATADIR%%/sounds/switch.wav