diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 8a9fb8afa02f..85d382306b34 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -1,58 +1,59 @@
 PORTNAME=	arpwatch
-PORTVERSION=	3.5
+PORTVERSION=	3.6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	https://ee.lbl.gov/downloads/arpwatch/ \
 		LOCAL/leres/arpwatch
 
 MAINTAINER=	leres@FreeBSD.org
 COMMENT=	Monitor arp & rarp requests
 WWW=		https://ee.lbl.gov/downloads/arpwatch/
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/pcap.h:net/libpcap
 RUN_DEPENDS=	${LOCALBASE}/include/pcap.h:net/libpcap
 
 USES=		python:run
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sendmail=/usr/sbin/sendmail
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
 SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	DEBUG ZEROPAD
 OPTIONS_DEFAULT=ZEROPAD
 OPTIONS_SUB=	yes
 
 ZEROPAD_DESC=	zero pad displayed ethernet addresses by default
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDEBUG}
 CONFIGURE_ARGS+=	--disable-optimization
 .endif
 
 .if ${PORT_OPTIONS:MZEROPAD}
 CONFIGURE_ARGS+=	--enable-zeropad
 .endif
 
 .ifdef ARPDIR
 MAKE_ARGS=	ARPDIR=${ARPDIR}
 .endif
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/arpwatch
 .for F in d.awk duplicates.awk euppertolower.awk e.awk p.awk
 	${INSTALL_DATA} ${WRKSRC}/${F} ${STAGEDIR}${PREFIX}/arpwatch
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/arp2ethers ${STAGEDIR}${PREFIX}/arpwatch
 	${INSTALL_SCRIPT} ${WRKSRC}/massagevendor.py \
 	    ${STAGEDIR}${PREFIX}/arpwatch/massagevendor
 	${INSTALL_SCRIPT} ${WRKSRC}/update-ethercodes.sh \
 	    ${STAGEDIR}${PREFIX}/arpwatch/update-ethercodes
 
 post-configure:
 	${REINPLACE_CMD} -e "/^LIBS *=/s,-lpcap,${LOCALBASE}/lib/libpcap.so.1," \
 		${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/arpwatch/distinfo b/net-mgmt/arpwatch/distinfo
index 60f38426c7f2..95cae84e3e14 100644
--- a/net-mgmt/arpwatch/distinfo
+++ b/net-mgmt/arpwatch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701627030
-SHA256 (arpwatch-3.5.tar.gz) = 86c24f722fd04384d005e4314a74cdea1beb28d437fb56940799e412e4607b0e
-SIZE (arpwatch-3.5.tar.gz) = 117594
+TIMESTAMP = 1705874916
+SHA256 (arpwatch-3.6.tar.gz) = f86529fe57fdb5a2ff5413bc13c245063f99b3bf742421fd3133272175be8156
+SIZE (arpwatch-3.6.tar.gz) = 117254
diff --git a/net-mgmt/arpwatch/pkg-plist b/net-mgmt/arpwatch/pkg-plist
index 8623cd9af164..e2c6389870f0 100644
--- a/net-mgmt/arpwatch/pkg-plist
+++ b/net-mgmt/arpwatch/pkg-plist
@@ -1,16 +1,16 @@
 arpwatch/arp2ethers
 arpwatch/d.awk
 arpwatch/duplicates.awk
 arpwatch/e.awk
 arpwatch/euppertolower.awk
 arpwatch/massagevendor
 arpwatch/p.awk
 arpwatch/update-ethercodes
 etc/rc.d/arpwatch
-man/man8/arpsnmp.8.gz
-man/man8/arpwatch.8.gz
 sbin/arpsnmp
 sbin/arpwatch
+share/man/man8/arpsnmp.8.gz
+share/man/man8/arpwatch.8.gz
 @touch arpwatch/arp.dat
 @rmempty arpwatch/arp.dat
 @dir(,operator,0755) arpwatch