diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index dda015ed04fa..316185793f2d 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -1,50 +1,55 @@
 PORTNAME=	jpeg-turbo
-DISTVERSION=	2.1.4
+DISTVERSION=	2.1.5.1
 PORTREVISION?=	0
 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=		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_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
+USES=		cmake cpe pathfix
 USE_LDCONFIG=	yes
-CMAKE_ON=	WITH_JPEG8
+
 CPE_PRODUCT=	libjpeg-turbo
 TEST_TARGET=	test
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/libjpeg-turbo
 
-OPTIONS_DEFINE=	DOCS
+CMAKE_ON=	WITH_JPEG8
+
+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/distinfo b/graphics/jpeg-turbo/distinfo
index 94dcee611bb2..d809d074ddc5 100644
--- a/graphics/jpeg-turbo/distinfo
+++ b/graphics/jpeg-turbo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1660686752
-SHA256 (libjpeg-turbo-2.1.4.tar.gz) = d3ed26a1131a13686dfca4935e520eb7c90ae76fbc45d98bb50a8dc86230342b
-SIZE (libjpeg-turbo-2.1.4.tar.gz) = 2261822
+TIMESTAMP = 1675923680
+SHA256 (libjpeg-turbo-2.1.5.1.tar.gz) = 2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf
+SIZE (libjpeg-turbo-2.1.5.1.tar.gz) = 2264936
diff --git a/graphics/jpeg-turbo/files/patch-CMakeLists.txt b/graphics/jpeg-turbo/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..339c381abded
--- /dev/null
+++ b/graphics/jpeg-turbo/files/patch-CMakeLists.txt
@@ -0,0 +1,25 @@
+--- CMakeLists.txt.orig	2023-02-09 07:01:27 UTC
++++ CMakeLists.txt
+@@ -393,14 +393,14 @@ if(MSVC)
+   add_definitions(-D_CRT_NONSTDC_NO_WARNINGS)
+ endif()
+ 
+-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+-  # Use the maximum optimization level for release builds
+-  foreach(var CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO)
+-    if(${var} MATCHES "-O2")
+-      string(REGEX REPLACE "-O2" "-O3" ${var} "${${var}}")
+-    endif()
+-  endforeach()
+-endif()
++#if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
++#  # Use the maximum optimization level for release builds
++#  foreach(var CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO)
++#    if(${var} MATCHES "-O2")
++#      string(REGEX REPLACE "-O2" "-O3" ${var} "${${var}}")
++#    endif()
++#  endforeach()
++#endif()
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+   if(CMAKE_C_COMPILER_ID MATCHES "SunPro")