diff --git a/graphics/jpeg-turbo/Makefile b/graphics/jpeg-turbo/Makefile
index 34d99b80b35f..a763cb824ebf 100644
--- a/graphics/jpeg-turbo/Makefile
+++ b/graphics/jpeg-turbo/Makefile
@@ -1,47 +1,51 @@
 # Created by: Denis Podolskiy <bytestore@yandex.ru>
 
 PORTNAME=	jpeg-turbo
-PORTVERSION=	2.0.6
+DISTVERSION=	2.1.1
 PORTREVISION?=	0
 CATEGORIES=	graphics
-MASTER_SITES=	SF/lib${PORTNAME}/${PORTVERSION}
-DISTNAME=	lib${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/lib${PORTNAME}/${DISTVERSION}
+DISTNAME=	lib${PORTNAME}-${DISTVERSION}
+
+PATCH_SITES=	https://github.com/libjpeg-turbo/libjpeg-turbo/commit/
+PATCHFILES=	173900b1cabb027495ae530c71250bcedc9925d5.patch:-p1 \
+		129f0cb76346ceede8f4d8d87dea8acb0809056c.patch:-p1
 
 MAINTAINER=	portmgr@FreeBSD.org
 COMMENT?=	SIMD-accelerated JPEG codec which replaces libjpeg
 
 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
 USE_LDCONFIG=	yes
 CMAKE_ON=	WITH_JPEG8
 CPE_PRODUCT=	libjpeg-turbo
 TEST_TARGET=	test
 
 PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/libjpeg-turbo
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == i386 || ${ARCH} == amd64
 BUILD_DEPENDS+=	nasm:devel/nasm
 .endif
 
 .if ${SLAVE_PORT} == yes
 PLIST_SUB+=	JPEG="@comment " LIBTURBOJPEG=""
 .else
 CMAKE_OFF=	WITH_TURBOJPEG
 CONFLICTS_INSTALL=	jpeg-[0-9]*
 PLIST_SUB+=	JPEG="" LIBTURBOJPEG="@comment "
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/jpeg-turbo/distinfo b/graphics/jpeg-turbo/distinfo
index 85cd570680a9..6615302b3bdd 100644
--- a/graphics/jpeg-turbo/distinfo
+++ b/graphics/jpeg-turbo/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1605684017
-SHA256 (libjpeg-turbo-2.0.6.tar.gz) = d74b92ac33b0e3657123ddcf6728788c90dc84dcb6a52013d758af3c4af481bb
-SIZE (libjpeg-turbo-2.0.6.tar.gz) = 2192315
+TIMESTAMP = 1631014994
+SHA256 (libjpeg-turbo-2.1.1.tar.gz) = b76aaedefb71ba882cbad4e9275b30c2ae493e3195be0a099425b5c6b99bd510
+SIZE (libjpeg-turbo-2.1.1.tar.gz) = 2256321
+SHA256 (173900b1cabb027495ae530c71250bcedc9925d5.patch) = 68e98cdb80e989840018fdad500073cf2f291b73693ae0da5b5964d65d6ad580
+SIZE (173900b1cabb027495ae530c71250bcedc9925d5.patch) = 1873
+SHA256 (129f0cb76346ceede8f4d8d87dea8acb0809056c.patch) = 0d0cb4e04c52151cbd44292e7d5c3c1f9bbf230123048e18125459ee8b56cc97
+SIZE (129f0cb76346ceede8f4d8d87dea8acb0809056c.patch) = 1991
diff --git a/graphics/jpeg-turbo/pkg-plist b/graphics/jpeg-turbo/pkg-plist
index ae21a2a923b9..a2ff841b8b09 100644
--- a/graphics/jpeg-turbo/pkg-plist
+++ b/graphics/jpeg-turbo/pkg-plist
@@ -1,26 +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.2.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
 %%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.2.0
 %%LIBTURBOJPEG%%libdata/pkgconfig/libturbojpeg.pc