diff --git a/fix-build-ffmpeg5.patch b/fix-build-ffmpeg5.patch
deleted file mode 100644
index c4c63cd..0000000
--- a/fix-build-ffmpeg5.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 59792cb0b801854ee41be72d33db9542735df754 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@gmail.com>
-Date: Wed, 27 Jul 2022 10:59:48 +0200
-Subject: [PATCH] decoder/ffmpeg: wrap FFmpeg include in "extern C"
-
-Commit ebae25d175eb31 added that #include, but forgot to wrap it in
-"extern C", so the linker tried to look up C++ symbols, causing linker
-failure.
-
-Closes https://github.com/MusicPlayerDaemon/MPD/issues/1582
----
-diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx
-index 2e22d95991..5b5c8b40e3 100644
---- a/src/decoder/plugins/FfmpegIo.cxx
-+++ b/src/decoder/plugins/FfmpegIo.cxx
-@@ -21,10 +21,13 @@
- #define __STDC_CONSTANT_MACROS
- 
- #include "FfmpegIo.hxx"
--#include "libavutil/mem.h"
- #include "../DecoderAPI.hxx"
- #include "input/InputStream.hxx"
- 
-+extern "C" {
-+#include <libavutil/mem.h>
-+}
-+
- AvioStream::~AvioStream()
- {
- 	if (io != nullptr) {
diff --git a/mpd-0.23.8.tar.xz b/mpd-0.23.8.tar.xz
deleted file mode 100644
index c74c14a..0000000
--- a/mpd-0.23.8.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86bb569bf3b519821f36f6bb5564e484e85d2564411b34b200fe2cd3a04e78cf
-size 773280
diff --git a/mpd-0.23.8.tar.xz.sig b/mpd-0.23.8.tar.xz.sig
deleted file mode 100644
index e3c84a2..0000000
Binary files a/mpd-0.23.8.tar.xz.sig and /dev/null differ
diff --git a/mpd-0.23.9.tar.xz b/mpd-0.23.9.tar.xz
new file mode 100644
index 0000000..67ecf2b
--- /dev/null
+++ b/mpd-0.23.9.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2becaba980402e8dc7972ccc3476e493b7ae2eeb720d31fa6712472ed48e9f2d
+size 774156
diff --git a/mpd-0.23.9.tar.xz.sig b/mpd-0.23.9.tar.xz.sig
new file mode 100644
index 0000000..cc20ed5
Binary files /dev/null and b/mpd-0.23.9.tar.xz.sig differ
diff --git a/mpd-conf.patch b/mpd-conf.patch
index ca236ba..f31b57b 100644
--- a/mpd-conf.patch
+++ b/mpd-conf.patch
@@ -1,6 +1,7 @@
-diff -Pdpru mpd-0.23.4.orig/doc/mpdconf.example mpd-0.23.4/doc/mpdconf.example
---- mpd-0.23.4.orig/doc/mpdconf.example	2021-11-11 12:16:36.000000000 +0300
-+++ mpd-0.23.4/doc/mpdconf.example	2021-11-13 01:39:07.843410617 +0300
+Index: mpd-0.23.9/doc/mpdconf.example
+===================================================================
+--- mpd-0.23.9.orig/doc/mpdconf.example
++++ mpd-0.23.9/doc/mpdconf.example
 @@ -17,7 +17,7 @@
  # playlist files not created by the server but only if they are in the MPD
  # format. This setting defaults to playlist saving being disabled.
diff --git a/mpd.changes b/mpd.changes
index 0373143..76db160 100644
--- a/mpd.changes
+++ b/mpd.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Aug 24 06:10:55 UTC 2022 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 0.23.9:
+  * input
+    + cdio_paranoia: add options "mode" and "skip"
+  * decoder
+    + ffmpeg: support FFmpeg 5.1
+  * filter
+    + replay gain: fix delayed volume display with handler=mixer
+  * output
+    + pipewire: set app icon
+  * fix bogus volume levels with multiple partitions
+  * improve iconv detection
+- Remove fix-build-ffmpeg5.patch 
+
 -------------------------------------------------------------------
 Mon Aug  8 08:19:19 UTC 2022 - Cor Blom <cornelis@solcon.nl>
 
diff --git a/mpd.spec b/mpd.spec
index c84ceee..2edd3cf 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -20,7 +20,7 @@
 %bcond_with    faad
 %bcond_without mpd_iso9660
 Name:           mpd
-Version:        0.23.8
+Version:        0.23.9
 Release:        0
 Summary:        Music Player Daemon
 License:        GPL-2.0-or-later
@@ -33,8 +33,6 @@ Source4:        %{name}.firewalld
 Source5:        %{name}.tmpfiles.d
 Patch0:         %{name}-conf.patch
 Patch1:         %{name}-sndfile.patch
-# PATCH-FIX-UPSTREAM - support ffmpeg 5.1
-Patch2:         fix-build-ffmpeg5.patch
 BuildRequires:  cmake
 BuildRequires:  gcc
 BuildRequires:  gcc-c++