diff --git a/audio/aubio/Makefile b/audio/aubio/Makefile
index c80be7dc53b1..53f5fc95ff03 100644
--- a/audio/aubio/Makefile
+++ b/audio/aubio/Makefile
@@ -1,76 +1,80 @@
 PORTNAME=	aubio
 PORTVERSION=	0.4.9
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES?=	audio
 MASTER_SITES=	https://aubio.org/pub/
 
+PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
+PATCHFILES+=	cdfe9cef2dcc3edf7d05ca2e9c2dbbf8dea21f1c.patch:-p1 #FFmpeg 6.x compat
+PATCHFILES+=	8a05420e5dd8c7b8b2447f82dc919765876511b3.patch:-p1 #FFmpeg 6.x compat
+
 MAINTAINER?=	jhale@FreeBSD.org
 COMMENT?=	Library for audio labelling
 WWW=		https://aubio.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES+=		cpe pkgconfig tar:bzip2
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
 
 .if !defined(SLAVEPORT)
 USES+=		python:build,3.6+ waf
 USE_LDCONFIG=	yes
 
 OPTIONS_GROUP=		DOCS
 OPTIONS_GROUP_DOCS=	DOCS DOXYGEN MANPAGES
 OPTIONS_DEFINE=		COMPLEX FFMPEG FFTW JACK SAMPLERATE SNDFILE TEST
 OPTIONS_DEFAULT=	FFMPEG FFTW JACK MANPAGES SAMPLERATE SNDFILE
 OPTIONS_SUB=		yes
 
 COMPLEX_DESC=			Compile with C99 complex.h
 COMPLEX_CONFIGURE_ENABLE=	complex
 
 DOCS_BUILD_DEPENDS=		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 DOCS_CONFIGURE_ENABLE=		sphinx
 DOCS_BINARY_ALIAS=		sphinx-build=sphinx-build-${PYTHON_VER}
 
 DOXYGEN_BUILD_DEPENDS=		doxygen:devel/doxygen
 DOXYGEN_CONFIGURE_ENABLE=	doxygen
 
 FFMPEG_LIB_DEPENDS=		libavcodec.so:multimedia/ffmpeg
 FFMPEG_CONFIGURE_ENABLE=	avcodec
 
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=		jack
 
 SAMPLERATE_LIB_DEPENDS=		libsamplerate.so:audio/libsamplerate
 SAMPLERATE_CONFIGURE_ENABLE=	samplerate
 
 FFTW_DESC=			Use single precision FFTW3 instead of built-in OOURA
 FFTW_CONFIGURE_ENABLE=		fftw3f
 FFTW_BUILD_DEPENDS=		${LOCALBASE}/include/fftw3.h:math/fftw3
 FFTW_LIB_DEPENDS=		libfftw3f.so:math/fftw3-float
 
 MANPAGES_BUILD_DEPENDS=		txt2man:textproc/txt2man
 MANPAGES_CONFIGURE_ENABLE=	manpages
 MANPAGES_CONFIGURE_ON=		--mandir=${MANPREFIX}/man
 
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 SNDFILE_CONFIGURE_ENABLE=	sndfile
 
 TEST_MAKE_ARGS=			--enable-tests
 TEST_MAKE_ARGS_OFF=		--disable-tests
 
 PORTDOCS=	*
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/pkgconfig/s|$${LIBDIR}|&data|' ${WRKSRC}/waflib/TaskGen.py
 
 post-install:
 .for b in mfcc notes onset pitch quiet track
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/aubio${b}
 .endfor
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libaubio.so
 
 .endif # !defined(SLAVEPORT)
 
 .include <bsd.port.mk>
diff --git a/audio/aubio/distinfo b/audio/aubio/distinfo
index a4d30920079a..ab4cfbdaf95b 100644
--- a/audio/aubio/distinfo
+++ b/audio/aubio/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1610896430
+TIMESTAMP = 1678741487
 SHA256 (aubio-0.4.9.tar.bz2) = d48282ae4dab83b3dc94c16cf011bcb63835c1c02b515490e1883049c3d1f3da
 SIZE (aubio-0.4.9.tar.bz2) = 397604
+SHA256 (cdfe9cef2dcc3edf7d05ca2e9c2dbbf8dea21f1c.patch) = 025b6d0668601a17ce8312ad4930d7ba99715b754191208347df46b9a07b0a91
+SIZE (cdfe9cef2dcc3edf7d05ca2e9c2dbbf8dea21f1c.patch) = 4743
+SHA256 (8a05420e5dd8c7b8b2447f82dc919765876511b3.patch) = 33b730d1aa0562d5cb96341fce268acb8a42a0381e9dcd52caef0fc2737b8ad0
+SIZE (8a05420e5dd8c7b8b2447f82dc919765876511b3.patch) = 729