diff --git a/multimedia/aom/Makefile b/multimedia/aom/Makefile
index dfa24344f29d..cd0f642aefd9 100644
--- a/multimedia/aom/Makefile
+++ b/multimedia/aom/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	aom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.2
+DISTVERSION=	3.1.3
 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
 
 VMAF_DESC=		Encoding tuning for VMAF
 VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
 VMAF_USES=		localbase:ldflags 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 771799a3285d..611768ca49ef 100644
--- a/multimedia/aom/distinfo
+++ b/multimedia/aom/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1626819795
-SHA256 (jbeich-aom-v3.1.2_GH0.tar.gz) = aa1e6610b7abf37659ddc682feac4f50cfa01539a7bd9ed329d670b07e3c55d4
-SIZE (jbeich-aom-v3.1.2_GH0.tar.gz) = 4613689
+TIMESTAMP = 1633047786
+SHA256 (jbeich-aom-v3.1.3_GH0.tar.gz) = 02c4c6552cce81a7106f09c5ddf3912979d6ea6b6bdf6a7673f08809fbeb4c74
+SIZE (jbeich-aom-v3.1.3_GH0.tar.gz) = 4614421
diff --git a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c b/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
index 426f8a1fff08..c8bce475ce5e 100644
--- a/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
+++ b/multimedia/aom/files/patch-aom__ports_arm__cpudetect.c
@@ -1,41 +1,41 @@
 - Assume NEON is enabled on aarch64
 - Implement NEON runtime detection on FreeBSD
 
---- aom_ports/arm_cpudetect.c.orig	2021-07-20 22:23:15 UTC
+--- aom_ports/arm_cpudetect.c.orig	2021-10-01 00:23:06 UTC
 +++ aom_ports/arm_cpudetect.c
 @@ -38,7 +38,7 @@ static int arm_cpu_env_mask(void) {
    return env && *env ? (int)strtol(env, NULL, 0) : ~0;
  }
  
--#if !CONFIG_RUNTIME_CPU_DETECT
-+#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON)
+-#if !CONFIG_RUNTIME_CPU_DETECT || defined(__APPLE__)
++#if !CONFIG_RUNTIME_CPU_DETECT || defined(__ARM_NEON) || defined(__APPLE__)
  
  int aom_arm_cpu_caps(void) {
    /* This function should actually be a no-op. There is no way to adjust any of
 @@ -143,7 +143,25 @@ int aom_arm_cpu_caps(void) {
    }
    return flags & mask;
  }
 -#else  /* end __linux__ */
 +#elif defined(__FreeBSD__)
 +
 +#include <sys/auxv.h>
 +
 +int aom_arm_cpu_caps(void) {
 +  int flags;
 +  int mask;
 +  u_long hwcap = 0;
 +  if (!arm_cpu_env_flags(&flags)) {
 +    return flags;
 +  }
 +  mask = arm_cpu_env_mask();
 +  elf_aux_info(AT_HWCAP, &hwcap, sizeof(hwcap));
 +#if HAVE_NEON
 +  if (hwcap & HWCAP_NEON) flags |= HAS_NEON;
 +#endif
 +  return flags & mask;
 +}
 +#else  /* end __FreeBSD__ */
  #error \
      "Runtime CPU detection selected, but no CPU detection method " \
  "available for your platform. Rerun cmake with -DCONFIG_RUNTIME_CPU_DETECT=0."
diff --git a/multimedia/aom/pkg-plist b/multimedia/aom/pkg-plist
index 7ca220e050ad..dd775ea4906d 100644
--- a/multimedia/aom/pkg-plist
+++ b/multimedia/aom/pkg-plist
@@ -1,16 +1,16 @@
 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_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.1.2
+lib/libaom.so.3.1.3
 libdata/pkgconfig/aom.pc