diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index e08b5df07a13..f611d3bf955e 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -1,91 +1,91 @@
 # Makefile.common - shared code between MesaLib ports.
 #
 # !!! Here be dragons !!! (they seem to be everywhere these days)
 #
 # Remember to upgrade the following ports everytime you bump MESAVERSION:
 #
 #    - graphics/libosmesa
 #    - graphics/mesa-dri
 #    - graphics/mesa-libs
 #    - lang/clover
 
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	22.3.5
+MESABASEVERSION=	22.3.6
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
 MASTER_SITES=	https://mesa.freedesktop.org/archive/ \
 		https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
 		ftp://ftp.freedesktop.org/pub/mesa/ \
 		ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
 
 DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	x11@FreeBSD.org
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/docs/license.rst
 
 COMPONENT=	${PORTNAME:tl:C/^lib//:C/mesa-//}
 
 BUILD_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs \
 		${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
 LIB_DEPENDS+=	libexpat.so:textproc/expat2
 .if ${COMPONENT} != clover
 .if ${PORT_OPTIONS:MPLATFORM_X11}
 USES+=	xorg
 .endif
 .endif
 .if ${COMPONENT} != osmesa
 LIB_DEPENDS+=	libdrm.so:graphics/libdrm
 .endif
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 .if ${OPSYS} == DragonFly
 LIB_DEPENDS+=	libelf.so:devel/libelf
 .endif
 
 USES+=		compiler:c++11-lib bison meson pathfix pkgconfig \
 		python:3.6+,build shebangfix tar:xz
 
 .if ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
 # --build-id isn't supported by old GNU ld.bfd in base
 # Also ld.bfd have problems that seems related to --as-needed
 USE_BINUTILS=		yes
 LDFLAGS+=		-B${LOCALBASE}/bin
 .endif
 
 # only have one port to check with portscout.
 .if ${PORTNAME} != mesa-dri
 PORTSCOUT=	ignore:1
 .endif
 
 python_OLD_CMD=	/usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python
 SHEBANG_FILES=	src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
 		src/gallium/drivers/svga/svgadump/svga_dump.py \
 		src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \
 		src/mesa/main/get_*.py src/util/format_srgb.py \
 		src/amd/*/*.py src/intel/genxml/gen_pack_header.py
 
 MASTERDIR=	${.CURDIR:H:H}/graphics/mesa-dri
 PATCHDIR=	${MASTERDIR}/files
 WRKSRC=		${WRKDIR}/mesa-${MESADISTVERSION}
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 PKGHELP=	${.CURDIR}/pkg-help
 PKGINSTALL=	${.CURDIR}/pkg-install
 PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
 
 .include <bsd.port.pre.mk>
 
 BINARY_ALIAS+=	python3=${PYTHON_VERSION}
 
 LLVM_DEFAULT=	15
 BUILD_DEPENDS+=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
 CONFIGURE_ENV+=	LLVM_CONFIG=llvm-config${LLVM_DEFAULT}
 
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
 MESON_ARGS+=	-Dllvm=enabled
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
index a69fbd524e4f..7bf3286cda63 100644
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675926912
-SHA256 (mesa-22.3.5.tar.xz) = 3eed2ecae2bc674494566faab9fcc9beb21cd804c7ba2b59a1694f3d7236e6a9
-SIZE (mesa-22.3.5.tar.xz) = 17069488
+TIMESTAMP = 1677487479
+SHA256 (mesa-22.3.6.tar.xz) = 4ec8ec65dbdb1ee9444dba72970890128a19543a58cf05931bd6f54f124e117f
+SIZE (mesa-22.3.6.tar.xz) = 17099008