diff --git a/mpd-0.20.18.tar.xz b/mpd-0.20.18.tar.xz
deleted file mode 100644
index 5633810..0000000
--- a/mpd-0.20.18.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a582dc2ae90b94ff3853f9ffd7d80b2c2b5fe2e2c35cb1da0b36f3f3dfad434
-size 792416
diff --git a/mpd-0.20.21.tar.xz b/mpd-0.20.21.tar.xz
new file mode 100644
index 0000000..13d34a5
--- /dev/null
+++ b/mpd-0.20.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8322764dc265c20f05c8c8fdfdd578b0722e74626bef56fcd8eebfb01acc58dc
+size 800476
diff --git a/mpd-fluidsynth.patch b/mpd-fluidsynth.patch
new file mode 100644
index 0000000..47540a7
--- /dev/null
+++ b/mpd-fluidsynth.patch
@@ -0,0 +1,14 @@
+--- a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx
++++ b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx
+@@ -64,7 +64,11 @@ fluidsynth_level_to_mpd(enum fluid_log_l
+  * logging library.
+  */
+ static void
++#if FLUIDSYNTH_VERSION_MAJOR == 1
+ fluidsynth_mpd_log_function(int level, char *message, gcc_unused void *data)
++#else
++fluidsynth_mpd_log_function(int level, const char *message, gcc_unused void *data)
++#endif
+ {
+ 	Log(fluidsynth_domain,
+ 	    fluidsynth_level_to_mpd(fluid_log_level(level)),
diff --git a/mpd.changes b/mpd.changes
index d4060f7..3f2892a 100644
--- a/mpd.changes
+++ b/mpd.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Wed Oct 17 12:37:51 UTC 2018 - olaf@aepfle.de
+
+- Update to ver 0.20.21 (2018/08/17)
+  * database
+    - proxy: add "password" setting
+    - proxy: support tags "ArtistSort", "AlbumArtistSort", "AlbumSort"
+    - simple: allow .mpdignore comments only at start of line
+    - proxy: fix "search already in progress" errors
+    - proxy: implement "list ... group"
+  * decoder
+    - dsdiff, dsf: support more MIME types
+    - dsdiff, dsf: allow 4 MB ID3 tags
+    - opus: support R128_ALBUM_GAIN tag
+    - ffmpeg: fix av_register_all() deprecation warning (FFmpeg 4.0)
+  * input
+    - mms: fix lockup bug and a crash bug
+  * output
+    - httpd: remove broken DLNA support code
+    - pulse: cork stream when paused due to "single" mode
+  * playlist
+    - cue: support file type declaration "FLAC" (non-standard)
+  * player
+    - fix spurious "Not seekable" error when switching radio streams
+  * protocol
+    - fix "modified-since" filter regression
+    - validate absolute seek time, reject negative values
+  * URI schemes are case insensitive
+- deal with API change in fluidsynth with mpd-fluidsynth.patch
+- use autosetup
+
 -------------------------------------------------------------------
 Sun Feb 25 09:45:09 UTC 2018 - mardnh@gmx.de
 
diff --git a/mpd.spec b/mpd.spec
index 5c48ce2..02d1d84 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -23,7 +23,7 @@
 %define _userunitdir %{_prefix}/lib/systemd/user
 %endif
 Name:           mpd
-Version:        0.20.18
+Version:        0.20.21
 Release:        0
 Summary:        Music Player Daemon
 License:        GPL-3.0-or-later
@@ -35,6 +35,7 @@ Source3:        mpd-user.conf
 # PATCH-FEATURE-OPENSUSE mpd-mpdconf_suse.patch --
 Patch0:         %{name}-mpdconf_suse.patch
 Patch1:         mpd-configh.patch
+Patch2:         mpd-fluidsynth.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 %if 0%{?suse_version} > 1315
@@ -133,9 +134,7 @@ for Gnome, KDE, console and Apache (PHP).
 Please read README.mpd how to configure it.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
 
 %build
 export CC=gcc