diff --git a/audio/cantata/Makefile b/audio/cantata/Makefile
index c0ef2b4ef0c8..28d2c240b8c1 100644
--- a/audio/cantata/Makefile
+++ b/audio/cantata/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=		cantata
 DISTVERSIONPREFIX=	v
-DISTVERSION=		2.3.3
-PORTREVISION=		4
+DISTVERSION=		2.4.0
 CATEGORIES=		audio kde
 
 MAINTAINER=		kde@FreeBSD.org
@@ -20,20 +19,22 @@ USE_QT=			buildtools_build concurrent core dbus gui network \
 			qmake_build sql sql-sqlite3_run svg widgets xml
 
 CMAKE_ON=		CMAKE_DISABLE_FIND_PACKAGE_UDev
+CMAKE_OFF=		ENABLE_CDIOPARANOIA
 
 SHEBANG_FILES=		playlists/cantata-dynamic cantata-remote.cmake
 CPE_VENDOR=		craig_drummond
 USE_LDCONFIG=		yes
 
-OPTIONS_DEFINE=		CDPARANOIA MTP NLS PROXY TAGLIB
+OPTIONS_DEFINE=		AVAHI CDPARANOIA MTP NLS PROXY TAGLIB
 OPTIONS_GROUP=		CDINFO REPLAYGAIN
 OPTIONS_GROUP_CDINFO=	CDDB MUSICBRAINZ
 OPTIONS_GROUP_REPLAYGAIN=	FFMPEG MPG123
 OPTIONS_RADIO=		HSP
 OPTIONS_RADIO_HSP=	QT5 VLC
-OPTIONS_DEFAULT=	CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB VLC
+OPTIONS_DEFAULT=	AVAHI CDDB CDPARANOIA FFMPEG MPG123 MTP MUSICBRAINZ TAGLIB VLC
 OPTIONS_SUB=		yes
 
+AVAHI_DESC=		Automatic MPD Discovery
 CDDB_DESC=		CD info retrieval via CDDB
 CDINFO_DESC=		AudioCD support
 FFMPEG_DESC=		ReplayGain calculation support via FFmpeg
@@ -46,6 +47,9 @@ REPLAYGAIN_DESC=	Replaygain calculation support
 TAGLIB_DESC=		Reading and editing Meta-Data of audio files
 VLC_DESC=		HTTP streams support via libVLC
 
+AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
+AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
+
 CDDB_IMPLIES=		CDPARANOIA
 CDDB_LIB_DEPENDS=	libcddb.so:audio/libcddb
 CDDB_CMAKE_BOOL=	ENABLE_CDDB
diff --git a/audio/cantata/distinfo b/audio/cantata/distinfo
index 27fbd29ff9d0..9b668e970f8b 100644
--- a/audio/cantata/distinfo
+++ b/audio/cantata/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1546180082
-SHA256 (CDrummond-cantata-v2.3.3_GH0.tar.gz) = 738fe9346b053b6131377dd7c0790aefffda6850546ca0c0d4e05295fb221b03
-SIZE (CDrummond-cantata-v2.3.3_GH0.tar.gz) = 4020353
+TIMESTAMP = 1581836351
+SHA256 (CDrummond-cantata-v2.4.0_GH0.tar.gz) = 783f30e4bfbeea8e08553eee40feab20f85db404a5b9082d4e3795d8d4111910
+SIZE (CDrummond-cantata-v2.4.0_GH0.tar.gz) = 4158803
diff --git a/audio/cantata/pkg-plist b/audio/cantata/pkg-plist
index 2c73b64ad1d0..8a202c6d35fc 100644
--- a/audio/cantata/pkg-plist
+++ b/audio/cantata/pkg-plist
@@ -12,11 +12,13 @@ share/applications/cantata.desktop
 %%NLS%%%%DATADIR%%/translations/cantata_de.qm
 %%NLS%%%%DATADIR%%/translations/cantata_en_GB.qm
 %%NLS%%%%DATADIR%%/translations/cantata_es.qm
+%%NLS%%%%DATADIR%%/translations/cantata_fi.qm
 %%NLS%%%%DATADIR%%/translations/cantata_fr.qm
 %%NLS%%%%DATADIR%%/translations/cantata_hu.qm
 %%NLS%%%%DATADIR%%/translations/cantata_it.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ja.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ko.qm
+%%NLS%%%%DATADIR%%/translations/cantata_nl.qm
 %%NLS%%%%DATADIR%%/translations/cantata_pl.qm
 %%NLS%%%%DATADIR%%/translations/cantata_pt_BR.qm
 %%NLS%%%%DATADIR%%/translations/cantata_ru.qm