diff --git a/devel/aarch64-none-elf-gcc/Makefile b/devel/aarch64-none-elf-gcc/Makefile
index f1d9fdad13227..a347f73bfa2c2 100644
--- a/devel/aarch64-none-elf-gcc/Makefile
+++ b/devel/aarch64-none-elf-gcc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	gcc
 PORTVERSION?=	11.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	GCC
 PKGNAMEPREFIX?=	aarch64-none-elf-
@@ -35,6 +35,7 @@ TARGETARCH=	${PKGNAMEPREFIX:C/-//g}
 GCC_TARGET?=	aarch64-none-elf
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_OUTSOURCE=	yes
 CONFIGURE_ARGS+=--target=${GCC_TARGET} --disable-nls --enable-languages=c,c++ \
 		--enable-gnu-indirect-function \
@@ -87,18 +88,18 @@ post-install:
 	fi
 .endfor
 .for f in c++ cpp g++ gcc gcc-ar gcc-nm gcc-ranlib gcov gcov-dump gcov-tool
-	@if [ ! -f ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ] ; then \
-		if [ -f ${STAGEDIR}${PREFIX}/man/man1/$f.1 ] ; then \
-			${CP} ${STAGEDIR}${PREFIX}/man/man1/$f.1  \
-			    ${STAGEDIR}${PREFIX}/man/man1/${GCC_TARGET}-$f.1 ; \
+	@if [ ! -f ${STAGEDIR}${PREFIX}/share/man/man1/${GCC_TARGET}-$f.1 ] ; then \
+		if [ -f ${STAGEDIR}${PREFIX}/share/man/man1/$f.1 ] ; then \
+			${CP} ${STAGEDIR}${PREFIX}/share/man/man1/$f.1  \
+			    ${STAGEDIR}${PREFIX}/share/man/man1/${GCC_TARGET}-$f.1 ; \
 		fi \
 	fi
 	@${RM} ${STAGEDIR}${PREFIX}/bin/$f
-	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1
-	@${RM} ${STAGEDIR}${PREFIX}/man/man1/$f.1.gz
+	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/$f.1
+	@${RM} ${STAGEDIR}${PREFIX}/share/man/man1/$f.1.gz
 .endfor
 	@${RM} ${STAGEDIR}${PREFIX}/share/info/*
-	@${RM} ${STAGEDIR}${PREFIX}/man/man7/*
+	@${RM} ${STAGEDIR}${PREFIX}/share/man/man7/*
 	${RM} -r ${STAGEDIR}/usr/lib/gcc/${GCC_TARGET}/${PORTVERSION}/include-fixed
 
 .include <bsd.port.post.mk>
diff --git a/devel/aarch64-none-elf-gcc/pkg-plist b/devel/aarch64-none-elf-gcc/pkg-plist
index b78969f0f2572..ecc1facca71fa 100644
--- a/devel/aarch64-none-elf-gcc/pkg-plist
+++ b/devel/aarch64-none-elf-gcc/pkg-plist
@@ -519,10 +519,10 @@ libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/liblto_plugin.so
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto-wrapper
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/lto1
 libexec/gcc/%%GCC_TARGET%%/%%GCC_VERSION%%/plugin/gengtype
-man/man1/%%GCC_TARGET%%-cpp.1.gz
-man/man1/%%GCC_TARGET%%-g++.1.gz
-man/man1/%%GCC_TARGET%%-gcc.1.gz
-man/man1/%%GCC_TARGET%%-gcov-dump.1.gz
-man/man1/%%GCC_TARGET%%-gcov-tool.1.gz
-man/man1/%%GCC_TARGET%%-gcov.1.gz
-man/man1/%%GCC_TARGET%%-lto-dump.1.gz
+share/man/man1/%%GCC_TARGET%%-cpp.1.gz
+share/man/man1/%%GCC_TARGET%%-g++.1.gz
+share/man/man1/%%GCC_TARGET%%-gcc.1.gz
+share/man/man1/%%GCC_TARGET%%-gcov-dump.1.gz
+share/man/man1/%%GCC_TARGET%%-gcov-tool.1.gz
+share/man/man1/%%GCC_TARGET%%-gcov.1.gz
+share/man/man1/%%GCC_TARGET%%-lto-dump.1.gz