diff --git a/multimedia/libgav1/Makefile b/multimedia/libgav1/Makefile
index 3f16773abd8b..128c0a3e4383 100644
--- a/multimedia/libgav1/Makefile
+++ b/multimedia/libgav1/Makefile
@@ -1,20 +1,23 @@
 PORTNAME=	libgav1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.16.3
+DISTVERSION=	0.17.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Main profile (0) & High profile (1) compliant AV1 decoder
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libabsl_synchronization.so:devel/abseil
 
-USES=		cmake compiler:c++17-lang localbase:ldflags
+USES=		cmake:testing compiler:c++17-lang localbase:ldflags
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	jbeich # mirror
+GH_TUPLE=	google:googletest:release-1.11.0:gtest/third_party/googletest
 CMAKE_ON=	BUILD_SHARED_LIBS
+CMAKE_OFF+=	${CMAKE_TESTING_ON}
+CMAKE_TESTING_ON=	LIBGAV1_ENABLE_TESTS
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (abseil deps)
 
 .include <bsd.port.mk>
diff --git a/multimedia/libgav1/distinfo b/multimedia/libgav1/distinfo
index ac607ec6d834..bf6fb4bdbe96 100644
--- a/multimedia/libgav1/distinfo
+++ b/multimedia/libgav1/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1618365301
-SHA256 (jbeich-libgav1-v0.16.3_GH0.tar.gz) = 30ef78bf79c21d890e049b565ba99a124fd2d27095bd51ac2e63549780ee5a10
-SIZE (jbeich-libgav1-v0.16.3_GH0.tar.gz) = 921201
+TIMESTAMP = 1635545517
+SHA256 (jbeich-libgav1-v0.17.0_GH0.tar.gz) = a768c8d64f928ab2ac04131b6b36f971c985d023854ddd50b0fb91ba980fd37c
+SIZE (jbeich-libgav1-v0.17.0_GH0.tar.gz) = 1154722
+SHA256 (google-googletest-release-1.11.0_GH0.tar.gz) = b4870bf121ff7795ba20d20bcdd8627b8e088f2d1dab299a031c1034eddc93d5
+SIZE (google-googletest-release-1.11.0_GH0.tar.gz) = 886330
diff --git a/multimedia/libgav1/files/patch-CMakeLists.txt b/multimedia/libgav1/files/patch-CMakeLists.txt
index 0a99df02b5a1..d6f6d70aca56 100644
--- a/multimedia/libgav1/files/patch-CMakeLists.txt
+++ b/multimedia/libgav1/files/patch-CMakeLists.txt
@@ -1,33 +1,33 @@
 - Sync -std= with devel/abseil to match ABI
 - Avoid leaking abseil dependency to shared library consumers
 
---- CMakeLists.txt.orig	2021-04-14 01:55:01 UTC
+--- CMakeLists.txt.orig	2021-10-29 22:11:57 UTC
 +++ CMakeLists.txt
 @@ -16,8 +16,8 @@
  cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR)
  
  # libgav1 requires C++11.
 -set(CMAKE_CXX_STANDARD 11)
 -set(ABSL_CXX_STANDARD 11)
 +set(CMAKE_CXX_STANDARD 17)
 +set(ABSL_CXX_STANDARD 17)
+ # libgav1 requires C99.
+ set(CMAKE_C_STANDARD 99)
  
- project(libgav1 CXX)
- 
-@@ -115,6 +115,8 @@ endif()
+@@ -123,6 +123,8 @@ endif()
  # Set test-only flags based on LIBGAV1_CXX_FLAGS.
  libgav1_set_test_flags()
  
 +find_package(absl)
 +if(NOT TARGET absl::base)
  set(libgav1_abseil "${libgav1_root}/third_party/abseil-cpp")
  if(NOT EXISTS "${libgav1_abseil}")
    message(
-@@ -127,6 +129,7 @@ if(NOT EXISTS "${libgav1_abseil}")
-       "    https://github.com/abseil/abseil-cpp.git third_party/abseil-cpp")
+@@ -136,6 +138,7 @@ if(NOT EXISTS "${libgav1_abseil}")
  endif()
+ set(ABSL_PROPAGATE_CXX_STD ON)
  add_subdirectory("${libgav1_abseil}" "${libgav1_abseil_build}" EXCLUDE_FROM_ALL)
 +endif() # NOT TARGET absl::base
  
  libgav1_reset_target_lists()
  libgav1_add_dsp_targets()
diff --git a/multimedia/libgav1/pkg-plist b/multimedia/libgav1/pkg-plist
index df55eaf7ebf0..b18697b04775 100644
--- a/multimedia/libgav1/pkg-plist
+++ b/multimedia/libgav1/pkg-plist
@@ -1,14 +1,14 @@
 bin/gav1_decode
 include/gav1/decoder.h
 include/gav1/decoder_buffer.h
 include/gav1/decoder_settings.h
 include/gav1/frame_buffer.h
 include/gav1/status_code.h
 include/gav1/symbol_visibility.h
 include/gav1/version.h
 lib/libgav1.a
 lib/libgav1.so
 lib/libgav1.so.0
-lib/libgav1.so.0.0.0
+lib/libgav1.so.0.0.1
 libdata/pkgconfig/libgav1.pc
 share/cmake/libgav1-config.cmake