diff --git a/math/form/Makefile b/math/form/Makefile
index bb946fdc542a..1aa427f334a1 100644
--- a/math/form/Makefile
+++ b/math/form/Makefile
@@ -1,51 +1,56 @@
 PORTNAME=	form
-PORTVERSION=	4.3.1
 DISTVERSIONPREFIX=	v
+DISTVERSION=	4.3.1
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Symbolic Manipulation System
 WWW=		https://www.nikhef.nl/~form/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgmp.so:math/gmp
 
 USES=		autoreconf gmake localbase
 USE_GITHUB=	yes
 GH_ACCOUNT=	vermaseren
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--disable-native \
 			--enable-largefile \
 			--enable-scalar \
 			--with-api=posix
 
 OPTIONS_DEFINE=	DOXYGEN OPENMPI
 OPTIONS_SUB=	yes
 
 MPICC?=		${LOCALBASE}/mpi/openmpi/bin/mpicc
 MPICXX?=	${LOCALBASE}/mpi/openmpi/bin/mpic++
 
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 OPENMPI_LIB_DEPENDS=		libgcc_s.so.1:lang/gcc9 \
 				libmpi.so:net/openmpi
 OPENMPI_CONFIGURE_ENABLE=	parform
 OPENMPI_CONFIGURE_ENV+=		MPICC="${MPICC}" \
 				MPICXX="${MPICXX}"
 
+# remove after manprefix migration
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400091 || ( ${OSVERSION} >= 1302507 && ${OSVERSION} < 1400000 ))
+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400091 || (${OSVERSION} >= 1302507 && \
+	${OSVERSION} < 1400000))
 CFLAGS+=	-Wno-error=incompatible-function-pointer-types
 .endif
 
 post-build-DOXYGEN-on:
 	(cd ${WRKSRC}/doc/manual; ${MAKE_CMD} html pdf)
 
 post-install-DOXYGEN-on:
 	(cd ${WRKSRC}/doc/manual && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${WRKSRC}/doc/manual/manual.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/form/pkg-plist b/math/form/pkg-plist
index 97989d9ecbb0..4177f77b9b7c 100644
--- a/math/form/pkg-plist
+++ b/math/form/pkg-plist
@@ -1,16 +1,16 @@
 bin/form
 bin/tform
 %%OPENMPI%%bin/parform
-man/man1/form.1.gz
+share/man/man1/form.1.gz
 %%DOXYGEN%%%%DOCSDIR%%/html/manual.css
 %%DOXYGEN%%%%DOCSDIR%%/html/manual.html
 %%DOXYGEN%%%%DOCSDIR%%/html/manual0x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual1x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual2x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual3x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual4x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual5x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual6x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual7x.png
 %%DOXYGEN%%%%DOCSDIR%%/html/manual8x.png
 %%DOXYGEN%%%%DOCSDIR%%/manual.pdf