diff --git a/math/amath/Makefile b/math/amath/Makefile
index 0b447117b076..c739a47bf652 100644
--- a/math/amath/Makefile
+++ b/math/amath/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	amath
 PORTVERSION=	1.8.5
+PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	http://dist1.innolan.net/ \
 		http://dist2.innolan.net/ \
 		https://amath.innolan.net/
 
 MAINTAINER=	cs@innolan.net
 COMMENT=	Simple command line calculator
 WWW=		https://amath.innolan.net/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_riscv64=		fails to compile: ./prim.h:117:2: Must define endianness
 
 USES=		gmake
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --pkgconfig=libdata/pkgconfig \
-		--mandir=man LDFLAGS="-L${LOCALBASE}/lib"
+		--mandir=share/man LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ARGS=	CC=${CC} CXX=${CXX}
 
 OPTIONS_DEFINE=	TESTS
 OPTIONS_DEFAULT=APPLIBM
 OPTIONS_RADIO=	LIBM
 OPTIONS_RADIO_LIBM=	APPLIBM OPENLIBM SYSLIBM
 OPTIONS_SUB=	yes
 APPLIBM_DESC=	Build and install application libraries
 LIBM_DESC=	Math libraries
 OPENLIBM_DESC=	Build with OpenLibm
 SYSLIBM_DESC=	System (-lm)
 TESTS_DESC=	Build with regression tests
 
 OPENLIBM_CONFIGURE_WITH=	openlibm
 OPENLIBM_LIB_DEPENDS=	libopenlibm.so:math/openlibm
 SYSLIBM_CONFIGURE_WITH=	libm
 TESTS_CONFIGURE_ENABLE=	test
 
 TEST_TARGET=	test
 
 post-install-APPLIBM-on:
 	${LN} -sf libamathapp.so ${STAGEDIR}${PREFIX}/lib/amath/libamathapp.so.1
 	${LN} -sf libamathcplex.so ${STAGEDIR}${PREFIX}/lib/amath/libamathcplex.so.1
 	${LN} -sf libamathc.so ${STAGEDIR}${PREFIX}/lib/amath/libamathc.so.1
 	${LN} -sf libamath.so ${STAGEDIR}${PREFIX}/lib/amath/libamath.so.1
 
 do-install-APPLIBM-off:
 	${INSTALL_PROGRAM} ${WRKSRC}/amath ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_MAN} ${WRKSRC}/amath.1 ${STAGEDIR}${PREFIX}/man/man1/
+	${INSTALL_MAN} ${WRKSRC}/amath.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 
 .include <bsd.port.mk>
diff --git a/math/amath/pkg-plist b/math/amath/pkg-plist
index 1ecc25191f11..3c52d7753ea1 100644
--- a/math/amath/pkg-plist
+++ b/math/amath/pkg-plist
@@ -1,35 +1,35 @@
 bin/amath
 %%APPLIBM%%include/amath/aengine.h
 %%APPLIBM%%include/amath/bigint.h
 %%APPLIBM%%include/amath/amath.h
 %%APPLIBM%%include/amath/amathc.h
 %%APPLIBM%%include/amath/mathi.h
 %%APPLIBM%%include/amath/mathr.h
 %%APPLIBM%%include/amath/charbuf.h
 %%APPLIBM%%include/amath/cplex.h
 %%APPLIBM%%include/amath/nnumb.h
 %%APPLIBM%%include/amath/ntext.h
 %%APPLIBM%%include/amath/ntextd.h
 %%APPLIBM%%include/amath/ntextp.h
 %%APPLIBM%%include/amath/numb.h
 %%APPLIBM%%include/amath/real.h
 %%APPLIBM%%lib/amath/libamath.a
 %%APPLIBM%%lib/amath/libamath.so
 %%APPLIBM%%lib/amath/libamath.so.1
 %%APPLIBM%%lib/amath/libamathapp.a
 %%APPLIBM%%lib/amath/libamathapp.so
 %%APPLIBM%%lib/amath/libamathapp.so.1
 %%APPLIBM%%lib/amath/libamathc.a
 %%APPLIBM%%lib/amath/libamathc.so
 %%APPLIBM%%lib/amath/libamathc.so.1
 %%APPLIBM%%lib/amath/libamathcplex.a
 %%APPLIBM%%lib/amath/libamathcplex.so
 %%APPLIBM%%lib/amath/libamathcplex.so.1
 %%APPLIBM%%libdata/pkgconfig/amatha.pc
 %%APPLIBM%%libdata/pkgconfig/amathc.pc
 %%APPLIBM%%libdata/pkgconfig/amathi.pc
 %%APPLIBM%%libdata/pkgconfig/amathr.pc
-man/man1/amath.1.gz
-%%APPLIBM%%man/man3/amathc.3.gz
-%%APPLIBM%%man/man3/amathi.3.gz
-%%APPLIBM%%man/man3/amathr.3.gz
+share/man/man1/amath.1.gz
+%%APPLIBM%%share/man/man3/amathc.3.gz
+%%APPLIBM%%share/man/man3/amathi.3.gz
+%%APPLIBM%%share/man/man3/amathr.3.gz