diff --git a/graphics/jpeg-xl/Makefile b/graphics/jpeg-xl/Makefile
index 24c315a01d98..fb68b7fd2a99 100644
--- a/graphics/jpeg-xl/Makefile
+++ b/graphics/jpeg-xl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	jpeg-xl
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.3.5
+DISTVERSION=	0.3.6
 CATEGORIES=	graphics
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -25,7 +25,7 @@ GH_TUPLE=	barmco:skcms:6437475:skcms/third_party/skcms \
 		webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \
 		${NULL}
 GL_ACCOUNT=	wg1
-GL_COMMIT=	f071e6c7d25984df04f4dc629646c3b0cca57de9
+GL_COMMIT=	c2d18d95df67fe167e495d22c9876d33438d4055
 CMAKE_ON=	JPEGXL_ENABLE_PLUGINS
 CMAKE_OFF=	JPEGXL_WARNINGS_AS_ERRORS ${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/}
 CMAKE_OFF+=	${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg
diff --git a/graphics/jpeg-xl/distinfo b/graphics/jpeg-xl/distinfo
index 9d58fac8e2a5..d0f7ad2d84c8 100644
--- a/graphics/jpeg-xl/distinfo
+++ b/graphics/jpeg-xl/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1616583319
+TIMESTAMP = 1616691846
 SHA256 (barmco-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01
 SIZE (barmco-skcms-6437475_GH0.tar.gz) = 9200034
 SHA256 (google-highway-0.11.1_GH0.tar.gz) = 4c4bb9501c02b27a0944afde8923aaab554384690d37e5b2a7f97553426ea641
@@ -7,5 +7,5 @@ SHA256 (lvandeve-lodepng-48e5364_GH0.tar.gz) = 41e0bcc686e31ee2d51a6c87c0089045f
 SIZE (lvandeve-lodepng-48e5364_GH0.tar.gz) = 239988
 SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726
 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084
-SHA256 (wg1-jpeg-xl-f071e6c7d25984df04f4dc629646c3b0cca57de9_GL0.tar.gz) = 8995aaf69cdecfbb7156c0b61d2f2e626c928170b90547ca12e8fb996ef636ec
-SIZE (wg1-jpeg-xl-f071e6c7d25984df04f4dc629646c3b0cca57de9_GL0.tar.gz) = 14564220
+SHA256 (wg1-jpeg-xl-c2d18d95df67fe167e495d22c9876d33438d4055_GL0.tar.gz) = a0b42ba16e336a5d8990c66098cf67acf98a9191b658c04b1bc3c733f449016e
+SIZE (wg1-jpeg-xl-c2d18d95df67fe167e495d22c9876d33438d4055_GL0.tar.gz) = 14564524
diff --git a/graphics/jpeg-xl/pkg-plist b/graphics/jpeg-xl/pkg-plist
index db702e8d1d8a..ced5debc4530 100644
--- a/graphics/jpeg-xl/pkg-plist
+++ b/graphics/jpeg-xl/pkg-plist
@@ -19,12 +19,12 @@ include/jxl/types.h
 lib/libjxl.a
 lib/libjxl.so
 lib/libjxl.so.0
-lib/libjxl.so.0.3.5
+lib/libjxl.so.0.3.6
 lib/libjxl_dec.a
 lib/libjxl_threads.a
 lib/libjxl_threads.so
 lib/libjxl_threads.so.0
-lib/libjxl_threads.so.0.3.5
+lib/libjxl_threads.so.0.3.6
 libdata/pkgconfig/libjxl.pc
 libdata/pkgconfig/libjxl_threads.pc
 %%GIMP%%libexec/gimp/2.2/plug-ins/file-jxl/file-jxl