diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index d7de509b666b..1d23b13307fc 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	openbgpd
 PORTVERSION=	5.2.20121209
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenBGPD
 DISTNAME=	${PORTNAME}-4.6
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
 WWW=		https://www.openbgpd.org/
 
 LICENSE=	ISCL
 LICENSE_FILE=	${FILESDIR}/COPYING
 
 USES=		tar:tgz uidfix
 USE_RC_SUBR=	${PORTNAME}
 
 CONFLICTS=	zebra quagga
 
 NO_WRKSUBDIR=	yes
-PLIST_FILES=	sbin/bgpctl sbin/bgpd man/man5/bgpd.conf.5.gz \
-		man/man8/bgpctl.8.gz man/man8/bgpd.8.gz
+PLIST_FILES=	sbin/bgpctl sbin/bgpd share/man/man5/bgpd.conf.5.gz \
+		share/man/man8/bgpctl.8.gz share/man/man8/bgpd.8.gz
 SUB_FILES=	pkg-message
 USERS=		_bgpd
 GROUPS=		_bgpd
 
 CFLAGS=		-fcommon
 
 OPTIONS_DEFINE=	IPV6LLPEER
 OPTIONS_DEFAULT=IPV6LLPEER
 IPV6LLPEER_DESC=Support nexthop using IPv6 link-local address
 IPV6LLPEER_MAKE_ARGS=	-DIPV6_LINKLOCAL_PEER
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g"	\
 	    ${WRKSRC}/bgpd/bgpd.8			\
 	    ${WRKSRC}/bgpd/bgpd.conf.5			\
 	    ${WRKSRC}/bgpctl/bgpctl.8
 
 .include <bsd.port.mk>
diff --git a/net/openbgpd/files/patch-Makefile.inc b/net/openbgpd/files/patch-Makefile.inc
index 7a2bef96c0d8..489b88da0449 100644
--- a/net/openbgpd/files/patch-Makefile.inc
+++ b/net/openbgpd/files/patch-Makefile.inc
@@ -1,12 +1,12 @@
 Index: Makefile.inc
 ===================================================================
 RCS file: Makefile.inc
 diff -N Makefile.inc
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ Makefile.inc	16 May 2014 01:06:14 -0000	1.5
 @@ -0,0 +1,5 @@
 +# $hrs: openbgpd/Makefile.inc,v 1.5 2014/05/16 01:06:14 hrs Exp $
 +
 +PREFIX?=	/usr/local
 +BINDIR?=	${PREFIX}/sbin
-+MANDIR?=	${PREFIX}/man/man
++MANDIR?=	${PREFIX}/share/man/man