diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index a21fa8275ad8..fb3a7bd4fabe 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -1,57 +1,58 @@
 PORTNAME=	jpeg-turbo
 DISTVERSION=	3.0.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/lib${PORTNAME}/${DISTVERSION}
 DISTNAME=	lib${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT?=	SIMD-accelerated JPEG codec which replaces libjpeg
 WWW?=		https://libjpeg-turbo.org/
 
 LICENSE=		BSD3CLAUSE IJG ZLIB
 LICENSE_COMB=		multi
 LICENSE_GROUPS_IJG=	FSF GPL
 LICENSE_NAME_IJG=	Independent JPEG Group License
 LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE.md
 LICENSE_FILE_IJG=	${WRKSRC}/README.ijg
 LICENSE_FILE_ZLIB=	${WRKSRC}/LICENSE.md
 LICENSE_PERMS_IJG=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES=		cmake cpe pathfix
 USE_LDCONFIG=	yes
 
 CPE_PRODUCT=	libjpeg-turbo
 TEST_TARGET=	test
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/libjpeg-turbo
 
 CMAKE_ON=	WITH_JPEG8
 # See https://github.com/libjpeg-turbo/libjpeg-turbo/issues/705
-CMAKE_ARGS=	-DCMAKE_CTEST_ARGUMENTS="-E;'djpeg12-shared-3x2-float-prog-cmp|djpeg12-static-3x2-float-prog-cmp'"
+CMAKE_ARGS=	-DCMAKE_CTEST_ARGUMENTS="-E;'djpeg12-shared-3x2-float-prog-cmp|djpeg12-static-3x2-float-prog-cmp'"aa \
+			-DCMAKE_INSTALL_MANDIR=${PREFIX}/share/man
 
 OPTIONS_DEFINE=		DOCS OPTIMIZED_CFLAGS
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS
 
 OPTIMIZED_CFLAGS_CFLAGS=	-O3
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
 BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 .if ${ARCH} == armv6
 CMAKE_OFF=	WITH_SIMD
 .endif
 
 .if ${SLAVE_PORT} == yes
 PLIST_SUB+=	JPEG="@comment " LIBTURBOJPEG=""
 .else
 CMAKE_OFF+=	WITH_TURBOJPEG
 CONFLICTS_INSTALL=	mozjpeg
 PLIST_SUB+=	JPEG="" LIBTURBOJPEG="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist
index 47381dba38f7..a09ff1ea301b 100644
--- a/graphics/jpeg-turbo/pkg-plist
+++ b/graphics/jpeg-turbo/pkg-plist
@@ -1,30 +1,30 @@
 %%JPEG%%bin/cjpeg
 %%JPEG%%bin/djpeg
 %%JPEG%%bin/jpegtran
 %%JPEG%%bin/rdjpgcom
 %%JPEG%%bin/wrjpgcom
 %%JPEG%%include/jconfig.h
 %%JPEG%%include/jerror.h
 %%JPEG%%include/jmorecfg.h
 %%JPEG%%include/jpeglib.h
 %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboConfig.cmake
 %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboConfigVersion.cmake
 %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%JPEG%%lib/cmake/libjpeg-turbo/libjpeg-turboTargets.cmake
 %%JPEG%%lib/libjpeg.a
 %%JPEG%%lib/libjpeg.so
 %%JPEG%%lib/libjpeg.so.8
 %%JPEG%%lib/libjpeg.so.8.3.2
 %%JPEG%%libdata/pkgconfig/libjpeg.pc
-%%JPEG%%man/man1/cjpeg.1.gz
-%%JPEG%%man/man1/djpeg.1.gz
-%%JPEG%%man/man1/jpegtran.1.gz
-%%JPEG%%man/man1/rdjpgcom.1.gz
-%%JPEG%%man/man1/wrjpgcom.1.gz
+%%JPEG%%share/man/man1/cjpeg.1.gz
+%%JPEG%%share/man/man1/djpeg.1.gz
+%%JPEG%%share/man/man1/jpegtran.1.gz
+%%JPEG%%share/man/man1/rdjpgcom.1.gz
+%%JPEG%%share/man/man1/wrjpgcom.1.gz
 %%LIBTURBOJPEG%%bin/tjbench
 %%LIBTURBOJPEG%%include/turbojpeg.h
 %%LIBTURBOJPEG%%lib/libturbojpeg.a
 %%LIBTURBOJPEG%%lib/libturbojpeg.so
 %%LIBTURBOJPEG%%lib/libturbojpeg.so.0
 %%LIBTURBOJPEG%%lib/libturbojpeg.so.0.3.0
 %%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc