diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index 48a1f3bccb5c..a10fbc96cb14 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,46 +1,42 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0
-PORTREVISION=	1
+DISTVERSION=	3.4.0
 CATEGORIES=	multimedia
 
-PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+=	b389ce89bdb6.patch:-p1 # unbreak JXL
-
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	AV1 reference encoder/decoder
 
 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 5b86847f970c..59e1d3007e89 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1644909642
-SHA256 (jbeich-aom-v3.3.0_GH0.tar.gz) = 298ced1f5aeed8f7c4e21138eeb646b19486e9c6e2d711640f4ae5822ad330c1
-SIZE (jbeich-aom-v3.3.0_GH0.tar.gz) = 4768166
-SHA256 (b389ce89bdb6.patch) = ce109a4b912c4400a46f09532bf3c059c3a661100cb85b8ae80d22ba64af8875
-SIZE (b389ce89bdb6.patch) = 2392
+TIMESTAMP = 1655487978
+SHA256 (jbeich-aom-v3.4.0_GH0.tar.gz) = 831ff8d1fe379beb2074722dd6bef253a2444965c2784a267ffab9183163e700
+SIZE (jbeich-aom-v3.4.0_GH0.tar.gz) = 5175309
diff --git a/multimedia/aom/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
index 175de31849f0..91b299b29a9d 100644
--- a/multimedia/aom/files/patch-CMakeLists.txt
+++ b/multimedia/aom/files/patch-CMakeLists.txt
@@ -1,17 +1,18 @@
 - Drop unused static libhwy dependency when using shared libjxl
 
---- CMakeLists.txt.orig	2021-10-13 17:24:39 UTC
+--- CMakeLists.txt.orig	2022-06-16 19:13:50 UTC
 +++ CMakeLists.txt
-@@ -525,12 +525,6 @@ if(CONFIG_AV1_ENCODER)
+@@ -565,13 +565,6 @@ if(CONFIG_AV1_ENCODER)
        if(LIBJXL_CFLAGS)
          append_compiler_flag("${LIBJXL_CFLAGS}")
        endif()
 -      pkg_check_modules(LIBHWY REQUIRED libhwy)
 -      target_link_libraries(aom PRIVATE ${LIBHWY_LDFLAGS} ${LIBHWY_LIBRARIES})
--      target_include_directories(aom PRIVATE ${LIBLIBHWY_INCLUDE_DIRS})
+-      target_include_directories(aom_dsp_encoder
+-                                 PRIVATE ${LIBLIBHWY_INCLUDE_DIRS})
 -      if(LIBHWY_CFLAGS)
 -        append_compiler_flag("${LIBHWY_CFLAGS}")
 -      endif()
      endif()
  
      set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX)
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index 88f645191596..d7e864ac8031 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.3.0
+lib/libaom.so.3.4.0
 libdata/pkgconfig/aom.pc