diff --git a/audio/sonata/Makefile b/audio/sonata/Makefile
index d2859d3300d1..4b51f7556e09 100644
--- a/audio/sonata/Makefile
+++ b/audio/sonata/Makefile
@@ -1,35 +1,57 @@
-PORTNAME=		sonata
-DISTVERSION=		1.7b1-22
-DISTVERSIONSUFFIX=	-gcee3555
-PORTREVISION=	3
-CATEGORIES=		audio python
-PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
+PORTNAME=	sonata
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.7.3
+PORTREVISION=	0
+CATEGORIES=	audio python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Elegant music player for MPD
-WWW=		http://sonata.berlios.de/index.html
+WWW=		https://github.com/multani/sonata
 
 LICENSE=	GPLv3
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-mpd2>=0.4.6:audio/py-python-mpd2@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=63.1.0:devel/py-setuptools@${PY_FLAVOR}
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}wheel>=0.48.0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-mpd2>=0.4.6:audio/py-python-mpd2@${PY_FLAVOR} \
+		xdg-open:devel/xdg-utils
 
 USES=		gettext gnome pkgconfig python
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	multani
 USE_GNOME=	pygobject3
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist pep517
 
-OPTIONS_DEFINE=	DOCS MMKEYS MPD TAGLIB
+PLIST_FILES=	${ICONSDIR}/sonata.png
+
+OPTIONS_DEFINE=		DOCS MMKEYS MPD
 OPTIONS_DEFAULT=	MPD
-MMKEYS_DESC=	Enable instance single support for mmkeys
-MPD_DESC=	Install Music Player Daemon
-TAGLIB_DESC=	Install support for editing metadata
-OPTIONS_SUB=	yes
+MMKEYS_DESC=		Enable instance single support for mmkeys
+MPD_DESC=		Install Music Player Daemon
+OPTIONS_SUB=		yes
 
 MPD_RUN_DEPENDS+=	musicpd:audio/musicpd
-MMKEYS_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR}
-TAGLIB_BROKEN=		audio/py-tagpy does not build with audio/taglib 2.x
-TAGLIB_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tagpy>=0.94.5:audio/py-tagpy@${FLAVOR}
+MMKEYS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.4:devel/py-dbus@${FLAVOR}
+
+ICONSDIR=	share/icons/hicolor/128x128/apps
+
+post-patch:
+	${REINPLACE_CMD} \
+		-e "s,\(name=\)'Sonata',\1'sonata',1" \
+		-e "s,/etc/mpd.conf,${PREFIX}/etc/musicpd.conf,1" \
+		-e "s,/var/lib/mpd,/var/mpd,g" \
+		-e "s,gksu,mdo,1" \
+		-e 's,\("service"\, \)"mpd",\1"musicpd",1' \
+		-e 's,ps wwu -C mpd,mdo ps -ww -U mpd,1' \
+		${WRKSRC}/sonata/plugins/ui/localmpd.glade \
+		${WRKSRC}/sonata/plugins/localmpd.py \
+		${WRKSRC}/po/*.po \
+		${WRKSRC}/setup.py
+
+post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${ICONSDIR}
+	${INSTALL_DATA} ${WRKSRC}/sonata/pixmaps/sonata.png \
+		${STAGEDIR}${PREFIX}/${ICONSDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/sonata/distinfo b/audio/sonata/distinfo
index cecf420eb19c..e934964bcefc 100644
--- a/audio/sonata/distinfo
+++ b/audio/sonata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1580382764
-SHA256 (multani-sonata-1.7b1-22-gcee3555_GH0.tar.gz) = ac28360a5c576ad40c6fdf591de30ed90c4a5f63a366254794ac2a646d3ae680
-SIZE (multani-sonata-1.7b1-22-gcee3555_GH0.tar.gz) = 2258513
+TIMESTAMP = 1788162299
+SHA256 (multani-sonata-v1.7.3_GH0.tar.gz) = 0e79c833a93d4e6b6279a45f5c95197c3c88c820ddb8c7a78a12fdd1e8e3923a
+SIZE (multani-sonata-v1.7.3_GH0.tar.gz) = 2257912