diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index a0ce860181084..621b406d3e23c 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -6,7 +6,6 @@
     <name>Mikle Kolyada</name>
   </maintainer>
   <use>
-    <flag name="adplug">Enable the AdPlug decoder plugin</flag>
     <flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
     <flag name="chromaprint">Enable ChromaPrint / AcoustID support</flag>
     <flag name="cue">Enable CUE sheet support</flag>
diff --git a/media-sound/mpd/mpd-0.21.18.ebuild b/media-sound/mpd/mpd-0.21.18-r1.ebuild
similarity index 97%
rename from media-sound/mpd/mpd-0.21.18.ebuild
rename to media-sound/mpd/mpd-0.21.18-r1.ebuild
index db09890f55c35..41e1d18a0a0a2 100644
--- a/media-sound/mpd/mpd-0.21.18.ebuild
+++ b/media-sound/mpd/mpd-0.21.18-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sh x86 ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+IUSE="+alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
@@ -21,7 +21,7 @@ IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	zeroconf zip zlib"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
@@ -38,7 +38,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
-	adplug? ( media-libs/adplug:= )
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -214,7 +213,8 @@ src_configure() {
 	fi
 
 	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
 		-Daudiofile=$(usex audiofile enabled disabled)
 		-Dfaad=$(usex faad enabled disabled)
 		-Dffmpeg=$(usex ffmpeg enabled disabled)
diff --git a/media-sound/mpd/mpd-0.21.19.ebuild b/media-sound/mpd/mpd-0.21.19-r1.ebuild
similarity index 97%
rename from media-sound/mpd/mpd-0.21.19.ebuild
rename to media-sound/mpd/mpd-0.21.19-r1.ebuild
index 3395216d6d390..3f87664378e55 100644
--- a/media-sound/mpd/mpd-0.21.19.ebuild
+++ b/media-sound/mpd/mpd-0.21.19-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~x86 ~x64-macos"
-IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
+IUSE="+alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	+ipv6 jack lame libav libmpdclient libsamplerate libsoxr +mad mikmod mms
 	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
@@ -21,7 +21,7 @@ IUSE="adplug +alsa ao audiofile bzip2 cdio chromaprint +cue +curl +dbus debug
 	zeroconf zip zlib"
 
 OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio recorder"
-DECODER_PLUGINS="adplug audiofile faad ffmpeg flac fluidsynth mad mikmod
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
 	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
 ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
 
@@ -38,7 +38,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	acct-user/mpd
-	adplug? ( media-libs/adplug:= )
 	alsa? (
 		media-libs/alsa-lib
 		media-sound/alsa-utils
@@ -214,7 +213,8 @@ src_configure() {
 	fi
 
 	emesonargs+=(
-		-Dadplug=$(usex adplug enabled disabled)
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
 		-Daudiofile=$(usex audiofile enabled disabled)
 		-Dfaad=$(usex faad enabled disabled)
 		-Dffmpeg=$(usex ffmpeg enabled disabled)