diff --git a/multimedia/vvdec/Makefile b/multimedia/vvdec/Makefile
index e8c2cc60d330..e7355ed4fe54 100644
--- a/multimedia/vvdec/Makefile
+++ b/multimedia/vvdec/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	vvdec
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.1.1
+DISTVERSION=	2.2.0
 CATEGORIES=	multimedia python
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Versatile Video Coding (VVC) decoder
 WWW=		https://github.com/fraunhoferhhi/vvdec
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 ONLY_FOR_ARCHS=		aarch64 armv6 armv7 amd64 powerpc powerpc64 powerpc64le riscv64
 
 USES=		cmake:noninja,testing compiler:c++14-lang
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	fraunhoferhhi
 
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		VVDEC_INSTALL_VVDECAPP
 CMAKE_OFF=	FREEBSD_VVDEC_ENABLE_X86_SIMD \
 		VVDEC_ENABLE_WARNINGS_AS_WERROR
 CMAKE_TESTING_TARGET=	test enable-bitstream-download=1 # tests fail to download bitstreams, see https://github.com/fraunhoferhhi/vvdec/issues/125
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == riscv64
 CMAKE_ARGS+=	-DVVDEC_ENABLE_LINK_TIME_OPT:BOOL=OFF
 .endif
 
 .include <bsd.port.mk>
diff --git a/multimedia/vvdec/distinfo b/multimedia/vvdec/distinfo
index c3fec7b3945d..fe136ee45feb 100644
--- a/multimedia/vvdec/distinfo
+++ b/multimedia/vvdec/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691730828
-SHA256 (fraunhoferhhi-vvdec-v2.1.1_GH0.tar.gz) = 82339389e8656b1e3923a42b5a99f960337906bc61473ce53b9b602fe7964cdf
-SIZE (fraunhoferhhi-vvdec-v2.1.1_GH0.tar.gz) = 1269073
+TIMESTAMP = 1710351508
+SHA256 (fraunhoferhhi-vvdec-v2.2.0_GH0.tar.gz) = 7a839f9d8c32abb3f0c33c5242d8b2ac7ff0842b160421332cc8c291b32547bc
+SIZE (fraunhoferhhi-vvdec-v2.2.0_GH0.tar.gz) = 1339562
diff --git a/multimedia/vvdec/files/patch-source_Lib_vvdec_vvdecimpl.h b/multimedia/vvdec/files/patch-source_Lib_vvdec_vvdecimpl.h
new file mode 100644
index 000000000000..1e05d99dc070
--- /dev/null
+++ b/multimedia/vvdec/files/patch-source_Lib_vvdec_vvdecimpl.h
@@ -0,0 +1,13 @@
+- workaround for https://github.com/fraunhoferhhi/vvdec/issues/170
+
+--- source/Lib/vvdec/vvdecimpl.h.orig	2024-03-13 17:45:41 UTC
++++ source/Lib/vvdec/vvdecimpl.h
+@@ -225,7 +225,7 @@ inline auto VVDecImpl::catchExceptions( MembFunc fn, A
+   static auto returnErrOrNullptr = []( intptr_t err )
+   {
+     if( std::is_pointer<TRet>() )
+-      return (TRet) NULL;
++      return (TRet) 0;
+     return (TRet) err;
+   };
+ 
diff --git a/multimedia/vvdec/pkg-plist b/multimedia/vvdec/pkg-plist
index d510acafbf7c..a89847a43a33 100644
--- a/multimedia/vvdec/pkg-plist
+++ b/multimedia/vvdec/pkg-plist
@@ -1,13 +1,13 @@
 bin/vvdecapp
 include/vvdec/sei.h
 include/vvdec/version.h
 include/vvdec/vvdec.h
 include/vvdec/vvdecDecl.h
 lib/cmake/vvdec/vvdecConfig.cmake
 lib/cmake/vvdec/vvdecConfigVersion.cmake
 lib/cmake/vvdec/vvdecTargets-shared-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/vvdec/vvdecTargets-shared.cmake
 lib/libvvdec.so
 lib/libvvdec.so.2
-lib/libvvdec.so.2.1.1
+lib/libvvdec.so.2.2.0
 libdata/pkgconfig/libvvdec.pc