diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 93209b9d28c7..9bffdf6e9e49 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.7.0-rc1
+DISTVERSION=	3.7.0
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 WWW=		https://aomedia.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
 BUILD_DEPENDS_amd64=	nasm:devel/nasm
 BUILD_DEPENDS_i386=	nasm:devel/nasm
 
 USES=		cmake compiler:c++11-lib perl5
 USE_GITHUB=	yes
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GH_ACCOUNT=	jbeich # mirror
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	ENABLE_DOCS ENABLE_TESTS
 
 OPTIONS_DEFINE=	JXL VMAF
 OPTIONS_DEFAULT=JXL VMAF
 
 JXL_DESC=		Encoding tuning for Butteraugli
 JXL_LIB_DEPENDS=	libjxl.so:graphics/libjxl
 JXL_USES=		pkgconfig
 JXL_CMAKE_ON=		-DCONFIG_TUNE_BUTTERAUGLI:STRING=1
 
 VMAF_DESC=		Encoding tuning for VMAF
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_USES=		pkgconfig
 VMAF_CMAKE_ON=		-DCONFIG_TUNE_VMAF:STRING=1
 
 post-patch:
 # Extract (snapshot) version from the port instead of CHANGELOG
 	@${REINPLACE_CMD} 's,$${AOM_ROOT}/CHANGELOG,${DISTVERSIONFULL:S/^v//},' \
 		${WRKSRC}/build/cmake/version.cmake
 
 .include <bsd.port.mk>
diff --git a/multimedia/aom/distinfo b/multimedia/aom/distinfo
index 949e2bf663d4..8b177a8e22fd 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1692048167
-SHA256 (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) = 99fad4d57a763f105b080c6ea483be2287a62929777319e293610618c3369063
-SIZE (jbeich-aom-v3.7.0-rc1_GH0.tar.gz) = 5355997
+TIMESTAMP = 1692990361
+SHA256 (jbeich-aom-v3.7.0_GH0.tar.gz) = f308f0df938233bc37b7d3f463bc877319e60811f1ff82f2a81acfb882b54368
+SIZE (jbeich-aom-v3.7.0_GH0.tar.gz) = 5355031
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
index bddd24159c96..91b299b29a9d 100644
--- a/multimedia/aom/files/patch-CMakeLists.txt
+++ b/multimedia/aom/files/patch-CMakeLists.txt
@@ -1,27 +1,18 @@
-- Add missing dependency for aom_static used by ENABLE_EXAMPLES
 - Drop unused static libhwy dependency when using shared libjxl
 
---- CMakeLists.txt.orig	2023-08-14 21:22:47 UTC
+--- CMakeLists.txt.orig	2022-06-16 19:13:50 UTC
 +++ CMakeLists.txt
-@@ -568,17 +568,14 @@ if(CONFIG_AV1_ENCODER)
-       target_include_directories(aom_dsp_encoder PRIVATE ${LIBJXL_INCLUDE_DIRS})
-     else()
-       pkg_check_modules(LIBJXL REQUIRED libjxl)
-+      if(BUILD_SHARED_LIBS)
-+        target_link_libraries(aom_static
-+                              PRIVATE ${LIBJXL_LDFLAGS} ${LIBJXL_LIBRARIES})
-+      endif()
-       target_link_libraries(aom PRIVATE ${LIBJXL_LDFLAGS} ${LIBJXL_LIBRARIES})
-       target_include_directories(aom_dsp_encoder PRIVATE ${LIBJXL_INCLUDE_DIRS})
+@@ -565,13 +565,6 @@ if(CONFIG_AV1_ENCODER)
        if(LIBJXL_CFLAGS)
          append_compiler_flag("${LIBJXL_CFLAGS}")
--      endif()
+       endif()
 -      pkg_check_modules(LIBHWY REQUIRED libhwy)
 -      target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS} ${LIBHWY_LIBRARIES})
 -      target_include_directories(aom_dsp_encoder
 -                                 PRIVATE ${LIBLIBHWY_INCLUDE_DIRS})
 -      if(LIBHWY_CFLAGS)
 -        append_compiler_flag("${LIBHWY_CFLAGS}")
-       endif()
+-      endif()
      endif()
  
+     set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index 4ade64aa8fb4..bcb8a077c108 100644
--- a/multimedia/aom/pkg-plist
+++ b/multimedia/aom/pkg-plist
@@ -1,17 +1,17 @@
 bin/aomdec
 bin/aomenc
 include/aom/aom.h
 include/aom/aom_codec.h
 include/aom/aom_decoder.h
 include/aom/aom_encoder.h
 include/aom/aom_external_partition.h
 include/aom/aom_frame_buffer.h
 include/aom/aom_image.h
 include/aom/aom_integer.h
 include/aom/aomcx.h
 include/aom/aomdx.h
+lib/libaom.a
 lib/libaom.so
 lib/libaom.so.3
 lib/libaom.so.3.7.0
-lib/libaom_static.a
 libdata/pkgconfig/aom.pc