diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index cb15e55d73b7..d2e9b55f6dcf 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,38 +1,43 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.2.0
 PORTREVISION=	1
 CATEGORIES=	multimedia
 
 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=	VMAF
+OPTIONS_DEFINE=	JXL VMAF
 OPTIONS_DEFAULT=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/files/patch-CMakeLists.txt b/multimedia/aom/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..175de31849f0
--- /dev/null
+++ b/multimedia/aom/files/patch-CMakeLists.txt
@@ -0,0 +1,17 @@
+- Drop unused static libhwy dependency when using shared libjxl
+
+--- CMakeLists.txt.orig	2021-10-13 17:24:39 UTC
++++ CMakeLists.txt
+@@ -525,12 +525,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})
+-      if(LIBHWY_CFLAGS)
+-        append_compiler_flag("${LIBHWY_CFLAGS}")
+-      endif()
+     endif()
+ 
+     set_target_properties(aom PROPERTIES LINKER_LANGUAGE CXX)