diff --git a/audio/picard/Makefile b/audio/picard/Makefile
index bb7415ea6b27..8f308712f4b1 100644
--- a/audio/picard/Makefile
+++ b/audio/picard/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	picard
-PORTVERSION=	2.9
+PORTVERSION=	2.9.1
 CATEGORIES=	audio python
 MASTER_SITES=	http://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/ \
 		http://ftp.osuosl.org/pub/musicbrainz/picard/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Next generation MusicBrainz Tagger
 WWW=		https://picard.musicbrainz.org/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
+BUILD_DEPENDS=	${PY_SETUPTOOLS} \
+		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}discid>=1.0:audio/py-discid@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mutagen>=1.37:audio/py-mutagen@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.7:devel/py-dateutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}fasteners>=0.14:devel/py-fasteners@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=5.1:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markdown>=3.2:textproc/py-markdown@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyjwt>=2.0:www/py-pyjwt@${PY_FLAVOR}
 
 USES=		gettext pyqt:5 python desktop-file-utils
 USE_LOCALE=	en_US.UTF-8
 USE_PYQT=	pyqt5:run sip
-USE_PYTHON=	autoplist distutils noflavors
+USE_PYTHON=	autoplist noflavors pep517 unittest
 
 CONFLICTS_INSTALL=	picard-tools py*-python-picard # bin/picard
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-release-${DISTVERSION}
-
 OPTIONS_DEFINE=		ACOUSTID PLUGINS
 OPTIONS_DEFAULT=	PLUGINS
 
 ACOUSTID_RUN_DEPENDS=	fpcalc:audio/chromaprint
 
 PLUGINS_DESC=		Install various plugins to extend functionality
 PLUGINS_RUN_DEPENDS=	picard-plugins>=2.0:audio/picard-plugins
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/picard/util/_astrcmp*.so
 
 .include <bsd.port.mk>
diff --git a/audio/picard/distinfo b/audio/picard/distinfo
index ff77d674591a..a706b71be2d7 100644
--- a/audio/picard/distinfo
+++ b/audio/picard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1690500422
-SHA256 (picard-2.9.tar.gz) = 89eb2d299f40eac9de7166593733c57942583dd1118f5c7a0b58278255fcd129
-SIZE (picard-2.9.tar.gz) = 6360770
+TIMESTAMP = 1692553916
+SHA256 (picard-2.9.1.tar.gz) = 7ae365a6c96e9411833b2c09b7a26cedd3984c874819c4515592a4da477136b8
+SIZE (picard-2.9.1.tar.gz) = 5270234
diff --git a/audio/picard/files/patch-picard_ui_options_general.py b/audio/picard/files/patch-picard_ui_options_general.py
new file mode 100644
index 000000000000..be04187a9c5b
--- /dev/null
+++ b/audio/picard/files/patch-picard_ui_options_general.py
@@ -0,0 +1,13 @@
+Disable checking for updates by default.
+
+--- picard/ui/options/general.py.orig	2023-08-16 07:38:39 UTC
++++ picard/ui/options/general.py
+@@ -71,7 +71,7 @@ class GeneralOptionsPage(OptionsPage):
+         TextOption("persist", "oauth_access_token", ""),
+         IntOption("persist", "oauth_access_token_expires", 0),
+         TextOption("persist", "oauth_username", ""),
+-        BoolOption("setting", "check_for_updates", True),
++        BoolOption("setting", "check_for_updates", False),
+         IntOption("setting", "update_check_days", 7),
+         IntOption("setting", "update_level", DEFAULT_PROGRAM_UPDATE_LEVEL),
+         IntOption("persist", "last_update_check", 0),