diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile
index de04c2ef8087..b9e5049df1c5 100644
--- a/mail/lbdb/Makefile
+++ b/mail/lbdb/Makefile
@@ -1,78 +1,80 @@
 PORTNAME=	lbdb
 PORTVERSION=	0.42.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.spinnaker.de/debian/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tools for use with mutt external mail address query feature
 WWW=		https://www.spinnaker.de/lbdb/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	gsed:textproc/gsed
 
 OPTIONS_DEFINE=	ABOOK EVOLUTION GPG LDAP
 ABOOK_DESC=	abook address book support
 EVOLUTION_DESC=	Ximan Evolution support
 GPG_DESC=	GNU Privacy Guard support
 
 WRKSRC=		${WRKDIR}/lbdb-${PORTVERSION}
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-lbdb-dotlock \
 		--libdir=${PREFIX}/libexec/lbdb
 MAKE_ARGS=	install_prefix=${STAGEDIR}
 USES=		gmake perl5
 
 .if exists (/usr/bin/getent)
 PLIST_SUB+=	GETENT=""
 .else
 PLIST_SUB+=	GETENT="@comment "
 .endif
 
 .if exists (/usr/bin/ypcat)
 PLIST_SUB+=	YPCAT=""
 .else
 PLIST_SUB+=	YPCAT="@comment "
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGPG}
 BUILD_DEPENDS+=	gpg:security/gnupg
 RUN_DEPENDS+=	gpg:security/gnupg
 PLIST_SUB+=	GPG=""
 .else
 PLIST_SUB+=	GPG="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MABOOK}
 BUILD_DEPENDS+=	abook:mail/abook
 RUN_DEPENDS+=	abook:mail/abook
 PLIST_SUB+=	ABOOK=""
 .else
 PLIST_SUB+=	ABOOK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MEVOLUTION}
 BUILD_DEPENDS+=	evolution:mail/evolution
 RUN_DEPENDS+=	evolution:mail/evolution
 PLIST_SUB+=	EVOLUTION=""
 .else
 PLIST_SUB+=	EVOLUTION="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLDAP}
 RUN_DEPENDS+=	p5-perl-ldap>=0:net/p5-perl-ldap
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's/sed/gsed/' ${WRKSRC}/m_muttalias.sh.in
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/lbdb_dotlock
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/lbdb/fetchaddr
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/lbdb/qpto8bit
 
 .include <bsd.port.mk>
diff --git a/mail/lbdb/pkg-plist b/mail/lbdb/pkg-plist
index 06984be6153f..e569acd24218 100644
--- a/mail/lbdb/pkg-plist
+++ b/mail/lbdb/pkg-plist
@@ -1,36 +1,36 @@
 bin/lbdb-fetchaddr
 bin/lbdb_dotlock
 bin/lbdbq
 bin/nodelist2lbdb
 etc/lbdb.rc
 etc/lbdb_ldap.rc
 libexec/lbdb/fetchaddr
 libexec/lbdb/lbdb-munge
 libexec/lbdb/lbdb_bbdb_query.el
 libexec/lbdb/lbdb_lib
 %%ABOOK%%libexec/lbdb/m_abook
 libexec/lbdb/m_bbdb
 %%EVOLUTION%%libexec/lbdb/m_evolution
 libexec/lbdb/m_fido
 libexec/lbdb/m_finger
 %%GETENT%%libexec/lbdb/m_getent
 libexec/lbdb/m_gnomecard
 %%GPG%%libexec/lbdb/m_gpg
 libexec/lbdb/m_inmail
 libexec/lbdb/m_ldap
 libexec/lbdb/m_muttalias
 libexec/lbdb/m_palm
 libexec/lbdb/m_passwd
 libexec/lbdb/m_pine
 libexec/lbdb/m_wanderlust
 %%YPCAT%%libexec/lbdb/m_yppasswd
 libexec/lbdb/munge
 libexec/lbdb/mutt_ldap_query
 libexec/lbdb/palm_lsaddr
 libexec/lbdb/qpto8bit
 libexec/lbdb/tac
-man/man1/lbdb-fetchaddr.1.gz
-man/man1/lbdb_dotlock.1.gz
-man/man1/lbdbq.1.gz
-man/man1/mutt_ldap_query.1.gz
-man/man1/nodelist2lbdb.1.gz
+share/man/man1/lbdb-fetchaddr.1.gz
+share/man/man1/lbdb_dotlock.1.gz
+share/man/man1/lbdbq.1.gz
+share/man/man1/mutt_ldap_query.1.gz
+share/man/man1/nodelist2lbdb.1.gz