diff --git a/audio/abcde/Makefile b/audio/abcde/Makefile
index 92f93d1f7316..63dad5da6202 100644
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@@ -1,73 +1,73 @@
 PORTNAME=	abcde
 DISTVERSION=	2.9.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	arved@FreeBSD.org
 COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format
 WWW=		https://abcde.einval.com/
 
 LICENSE=	ART10 GPLv2
 LICENSE_COMB=	dual
 
 RUN_DEPENDS=	cd-discid:audio/cd-discid \
 		cdparanoia:audio/cdparanoia \
 		lame:audio/lame \
 		eyeD3:audio/py-eyed3 \
 		oggenc:audio/vorbis-tools \
 		bash:shells/bash
 
 USES=		shebangfix
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SHEBANG_FILES=	abcde abcde-musicbrainz-tool cddb-tool
 
 SUB_FILES=	pkg-message
 
 OPTIONS_GROUP=		CODEC RIPPER
 OPTIONS_GROUP_CODEC=	AAC FLAC MPP OPUS SPEEX
 OPTIONS_GROUP_RIPPER=	CDDA2WAV DAGRAB
 OPTIONS_DEFINE=		MUSICBRAINZ NORMALIZE REPLAYGAIN
 OPTIONS_DEFAULT=	MUSICBRAINZ
 
 AAC_RUN_DEPENDS=	faac:audio/faac
 CDDA2WAV_RUN_DEPENDS=	cdda2wav:sysutils/cdrtools
 DAGRAB_RUN_DEPENDS=	dagrab:audio/dagrab
 FLAC_RUN_DEPENDS=	flac:audio/flac
 MPP_RUN_DEPENDS=	mpcenc:audio/musepack
 MUSICBRAINZ_DESC=	Enable MusicBrainz DiscID support
 MUSICBRAINZ_USES=	perl5
 MUSICBRAINZ_USE=	PERL5=run
 MUSICBRAINZ_RUN_DEPENDS=	\
 		p5-MusicBrainz-DiscID>=0:audio/p5-MusicBrainz-DiscID \
 		p5-WebService-MusicBrainz>=1:www/p5-WebService-MusicBrainz
 NORMALIZE_DESC=		Enable normalize support
 NORMALIZE_RUN_DEPENDS=	normalize:audio/normalize
 OPUS_RUN_DEPENDS=	opusenc:audio/opus-tools
 REPLAYGAIN_DESC=	Enable (vorbis|mp3)gain support
 REPLAYGAIN_RUN_DEPENDS=	mp3gain:audio/mp3gain \
 			vorbisgain:audio/vorbisgain
 SPEEX_RUN_DEPENDS=	speexenc:audio/speex
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\([[:space:]]\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \
 		${WRKSRC}/abcde
 	@${REINPLACE_CMD} -e \
 		's|\(fI\)\(/etc/abcde.conf\)|\1${PREFIX}\2|' \
 		${WRKSRC}/abcde.1
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde cddb-tool \
 		${STAGEDIR}${PREFIX}/bin)
 	(cd ${WRKSRC} && ${INSTALL_DATA} abcde.conf \
 		${STAGEDIR}${PREFIX}/etc/abcde.conf.sample)
 	(cd ${WRKSRC} && ${INSTALL_MAN} abcde.1 cddb-tool.1 \
 		${STAGEDIR}${MANPREFIX}/man/man1)
 post-install-MUSICBRAINZ-on:
 	(cd ${WRKSRC} && ${INSTALL_SCRIPT} abcde-musicbrainz-tool \
 		${STAGEDIR}${PREFIX}/bin)
 
 .include <bsd.port.mk>
diff --git a/audio/abcde/files/patch-abcde b/audio/abcde/files/patch-abcde
new file mode 100644
index 000000000000..9aa4f051b50b
--- /dev/null
+++ b/audio/abcde/files/patch-abcde
@@ -0,0 +1,13 @@
+--- abcde.orig	2023-12-30 21:03:35.018291000 +0100
++++ abcde	2023-12-30 21:05:32.092326000 +0100
+@@ -3770,8 +3770,8 @@
+ # CDDB
+ # Currently three supported options ("musicbrainz", "cddb" for freedb.org and "cdtext")
+ CDDBMETHOD=musicbrainz
+-CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi"
+-CDDBSUBMIT=freedb-submit@freedb.org
++CDDBURL="http://gnudb.gnudb.org/~cddb/cddb.cgi"
++CDDBSUBMIT=submit@gnudb.org
+ CDDBPROTO=6
+ HELLOINFO="$(whoami)@$(hostname)"
+ CDDBCOPYLOCAL="n"