diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index 6d3b0205440d..39793e8a339c 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -1,52 +1,54 @@
 PORTNAME=	hamlib
 PORTVERSION=	4.5.5
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Shared libraries for Amateur Radio Equipment Control Applications
 WWW=		https://sourceforge.net/projects/hamlib/
 
 LICENSE=	LGPL20
 
 BUILD_DEPENDS=	swig:devel/swig
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USES=		autoreconf gnome libtool:keepla localbase:ldflags pathfix perl5 pkgconfig python \
 		readline shebangfix tcl
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 USE_PERL5=	build run
 USE_PYTHON=	py3kplist
 
 # $TCL_INCLUDE_SPEC
 SHEBANG_FILES=	bindings/perltest.pl
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-perl-binding \
 		--with-tcl-binding --with-tcl=${TCL_LIBDIR} \
 		--with-libusb \
 		--with-python-binding
 CONFIGURE_ENV=	LIBUSB_LIBS="-lusb" cf_with_cxx=yes
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 PLIST_SUB=	TCL_VER=${TCL_VER}
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 	${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' \
 		${WRKSRC}/bindings/Hamlib-pl.mk
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Hamlib/Hamlib.so
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in ${WRKSRC}/AUTHORS ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB \
 		${WRKSRC}/ChangeLog ${WRKSRC}/INSTALL ${WRKSRC}/LICENSE \
 		${WRKSRC}/NEWS ${WRKSRC}/PLAN ${WRKSRC}/README \
 		${WRKSRC}/README.betatester ${WRKSRC}/README.osx \
 		${WRKSRC}/README.developer ${WRKSRC}/README.freqranges \
 		${WRKSRC}/README.multicast ${WRKSRC}/THANKS
 	${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/comms/hamlib/pkg-plist b/comms/hamlib/pkg-plist
index f76ccf67e040..798dd94089c8 100644
--- a/comms/hamlib/pkg-plist
+++ b/comms/hamlib/pkg-plist
@@ -1,78 +1,78 @@
 bin/ampctl
 bin/ampctld
 bin/rigctl
 bin/rigctlcom
 bin/rigctld
 bin/rigmem
 bin/rigsmtr
 bin/rigswr
 bin/rotctl
 bin/rotctld
 include/hamlib/ampclass.h
 include/hamlib/amplifier.h
 include/hamlib/amplist.h
 include/hamlib/config.h
 include/hamlib/rig.h
 include/hamlib/rig_dll.h
 include/hamlib/rigclass.h
 include/hamlib/riglist.h
 include/hamlib/rotator.h
 include/hamlib/rotclass.h
 include/hamlib/rotlist.h
 lib/libhamlib++.a
 lib/libhamlib++.la
 lib/libhamlib++.so
 lib/libhamlib++.so.4
 lib/libhamlib++.so.4.0.6
 lib/libhamlib.a
 lib/libhamlib.la
 lib/libhamlib.so
 lib/libhamlib.so.4
 lib/libhamlib.so.4.0.6
 %%SITE_ARCH%%/Hamlib.pm
 %%SITE_ARCH%%/auto/Hamlib/Hamlib.so
 %%SITE_ARCH%%/perltest.pl
 %%PYTHON_SITELIBDIR%%/Hamlib.py
 %%PYTHON_SITELIBDIR%%/_Hamlib.a
 %%PYTHON_SITELIBDIR%%/_Hamlib.la
 %%PYTHON_SITELIBDIR%%/_Hamlib.so
 %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/__pycache__/Hamlib%%PYTHON_EXT_SUFFIX%%.pyc
 lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl-4.6.so
 lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.a
 lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.la
 lib/tcl%%TCL_VER%%/Hamlib/hamlibtcl.so
 lib/tcl%%TCL_VER%%/Hamlib/pkgIndex.tcl
 libdata/pkgconfig/hamlib.pc
-man/man1/ampctl.1.gz
-man/man1/ampctld.1.gz
-man/man1/rigctl.1.gz
-man/man1/rigctlcom.1.gz
-man/man1/rigctld.1.gz
-man/man1/rigmem.1.gz
-man/man1/rigsmtr.1.gz
-man/man1/rigswr.1.gz
-man/man1/rotctl.1.gz
-man/man1/rotctld.1.gz
-man/man7/hamlib-primer.7.gz
-man/man7/hamlib-utilities.7.gz
-man/man7/hamlib.7.gz
+share/man/man1/ampctl.1.gz
+share/man/man1/ampctld.1.gz
+share/man/man1/rigctl.1.gz
+share/man/man1/rigctlcom.1.gz
+share/man/man1/rigctld.1.gz
+share/man/man1/rigmem.1.gz
+share/man/man1/rigsmtr.1.gz
+share/man/man1/rigswr.1.gz
+share/man/man1/rotctl.1.gz
+share/man/man1/rotctld.1.gz
+share/man/man7/hamlib-primer.7.gz
+share/man/man7/hamlib-utilities.7.gz
+share/man/man7/hamlib.7.gz
 share/aclocal/hamlib.m4
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.LIB
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PLAN
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.betatester
 %%PORTDOCS%%%%DOCSDIR%%/README.developer
 %%PORTDOCS%%%%DOCSDIR%%/README.osx
 %%PORTDOCS%%%%DOCSDIR%%/README.freqranges
 %%PORTDOCS%%%%DOCSDIR%%/README.multicast
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%PORTDOCS%%%%DOCSDIR%%/examples/perltest.pl
 %%PORTDOCS%%%%DOCSDIR%%/examples/py3test.py
 %%PORTDOCS%%%%DOCSDIR%%/examples/tcltest.tcl