diff --git a/audio/libopenmpt/Makefile b/audio/libopenmpt/Makefile
index 3f2ff9d28c99..0cad63f2cd06 100644
--- a/audio/libopenmpt/Makefile
+++ b/audio/libopenmpt/Makefile
@@ -1,65 +1,68 @@
 PORTNAME=	libopenmpt
 DISTVERSION=	0.7.3
 DISTVERSIONSUFFIX=	+release.autotools
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://lib.openmpt.org/files/libopenmpt/src/ \
 		LOCAL/ehaupt
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Module music library based on OpenMPT
 WWW=		https://lib.openmpt.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libmpg123.so:audio/mpg123 \
 		libvorbis.so:audio/libvorbis
 
 USES=		compiler:c++17-lang cpe gmake libtool pathfix pkgconfig
 CPE_VENDOR=	openmpt
 USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=     ${PREFIX}/share
+
 CONFIGURE_ARGS=	--disable-doxygen-doc \
 		--with-mpg123 \
 		--with-vorbis \
 		--with-vorbisfile \
 		--without-portaudiocpp
 
 TEST_TARGET=	check
 
 OPTIONS_DEFINE=		DOCS EXAMPLES OPENMPT123 PULSEAUDIO
 OPTIONS_DEFAULT=	OPENMPT123
 OPTIONS_SUB=		yes
 
 OPENMPT123_DESC=	Enable command line player
 PULSEAUDIO_DESC=	Enable PulseAudio support for openmpt123
 
 OPENMPT123_LIB_DEPENDS=		libFLAC.so:audio/flac \
 				libogg.so:audio/libogg \
 				libportaudio.so:audio/portaudio \
 				libsndfile.so:audio/libsndfile
 OPENMPT123_CONFIGURE_OFF=	--disable-openmpt123
 OPENMPT123_CONFIGURE_WITH=	flac portaudio sndfile
 
 PULSEAUDIO_IMPLIES=		OPENMPT123
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_WITH=	pulseaudio
 
 pre-configure:
 	@${REINPLACE_CMD} -e 's/+release.autotools//' \
 		${PATCH_WRKSRC}/configure
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenmpt.so.*
 
 post-install-DOCS-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/LICENSE # do not install twice
 
 post-install-EXAMPLES-on:
 	@${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
 
 post-install-EXAMPLES-off:
 	@${RM} -rf ${STAGEDIR}${DOCSDIR}/examples
 
 .include <bsd.port.mk>
diff --git a/audio/libopenmpt/pkg-plist b/audio/libopenmpt/pkg-plist
index 8ed2a7ea4339..5e6056c20194 100644
--- a/audio/libopenmpt/pkg-plist
+++ b/audio/libopenmpt/pkg-plist
@@ -1,27 +1,27 @@
 %%OPENMPT123%%bin/openmpt123
 include/libopenmpt/libopenmpt.h
 include/libopenmpt/libopenmpt.hpp
 include/libopenmpt/libopenmpt_config.h
 include/libopenmpt/libopenmpt_ext.h
 include/libopenmpt/libopenmpt_ext.hpp
 include/libopenmpt/libopenmpt_stream_callbacks_buffer.h
 include/libopenmpt/libopenmpt_stream_callbacks_fd.h
 include/libopenmpt/libopenmpt_stream_callbacks_file.h
 include/libopenmpt/libopenmpt_stream_callbacks_file_mingw.h
 include/libopenmpt/libopenmpt_stream_callbacks_file_msvcrt.h
 include/libopenmpt/libopenmpt_stream_callbacks_file_posix.h
 include/libopenmpt/libopenmpt_stream_callbacks_file_posix_lfs64.h
 include/libopenmpt/libopenmpt_version.h
 lib/libopenmpt.a
 lib/libopenmpt.so
 lib/libopenmpt.so.0
 lib/libopenmpt.so.0.4.4
 libdata/pkgconfig/libopenmpt.pc
-%%OPENMPT123%%man/man1/openmpt123.1.gz
+%%OPENMPT123%%share/man/man1/openmpt123.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c_mem.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c_probe.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c_stdout.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_c_unsafe.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/libopenmpt_example_cxx.cpp