diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 2f0d1b0c69b8..4b986ac81b57 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -1,34 +1,36 @@
 PORTNAME=	xvkbd
 PORTVERSION=	4.1
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://t-sato.in.coocan.jp/xvkbd/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Virtual keyboard for X applications
 WWW=		http://t-sato.in.coocan.jp/xvkbd/
 
 LICENSE=	GPLv2+
 
 USES=		gmake pkgconfig xorg
 USE_XORG=	x11 xaw xmu xt xtst
 
 DESKTOP_ENTRIES="Xvkbd" "" "" "xvkbd" "Utility;" false
 
 OPTIONS_DEFINE=		DOCS
 
 GNU_CONFIGURE=		yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 XAW3D_DESC=		Xaw3d widget library support
 XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
 XTEST_DESC=		XTEST extensions support
 XTEST_USES=		xorg
 XTEST_USE=		xorg=xtst
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/usr/include/|${LOCALBASE}/include/|' ${WRKSRC}/XVkbd-small.ad
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/xvkbd/pkg-plist b/x11/xvkbd/pkg-plist
index 7d7c4c97ea97..c68077904533 100644
--- a/x11/xvkbd/pkg-plist
+++ b/x11/xvkbd/pkg-plist
@@ -1,32 +1,32 @@
 bin/xvkbd
 share/X11/app-defaults/XVkbd
 share/X11/app-defaults/XVkbd-belgian
 share/X11/app-defaults/XVkbd-common
 share/X11/app-defaults/XVkbd-danish
 share/X11/app-defaults/XVkbd-fitaly
 share/X11/app-defaults/XVkbd-french
 share/X11/app-defaults/XVkbd-french2
 share/X11/app-defaults/XVkbd-german
 share/X11/app-defaults/XVkbd-greek
 share/X11/app-defaults/XVkbd-hebrew
 share/X11/app-defaults/XVkbd-icelandic
 share/X11/app-defaults/XVkbd-italian
 share/X11/app-defaults/XVkbd-jisx6002
 share/X11/app-defaults/XVkbd-jisx6004
 share/X11/app-defaults/XVkbd-korean
 share/X11/app-defaults/XVkbd-latin1
 share/X11/app-defaults/XVkbd-norwegian
 share/X11/app-defaults/XVkbd-portuguese
 share/X11/app-defaults/XVkbd-russian
 share/X11/app-defaults/XVkbd-slovene
 share/X11/app-defaults/XVkbd-small
 share/X11/app-defaults/XVkbd-spanish
 share/X11/app-defaults/XVkbd-strip
 share/X11/app-defaults/XVkbd-swedish
 share/X11/app-defaults/XVkbd-swissgerman
 share/X11/app-defaults/XVkbd-turkish
 share/X11/app-defaults/XVkbd-turkishF
 share/X11/app-defaults/XVkbd-uk
-man/man1/xvkbd.1.gz
+share/man/man1/xvkbd.1.gz
 %%DATADIR%%/words.english
 %%PORTDOCS%%%%DOCSDIR%%/README