diff --git a/abcde-2.7-normalize.patch b/abcde-2.7-normalize.patch
deleted file mode 100644
index 5d0106b..0000000
--- a/abcde-2.7-normalize.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -up abcde-2.7/abcde~ abcde-2.7/abcde
---- abcde-2.7/abcde~	2015-06-18 15:26:40.000000000 +0300
-+++ abcde-2.7/abcde	2015-06-20 22:57:18.918621425 +0300
-@@ -3451,7 +3451,7 @@ MUSICBRAINZ=abcde-musicbrainz-tool
- EJECT=eject
- MD5SUM=md5sum
- DISTMP3=distmp3
--NORMALIZE=normalize-audio
-+NORMALIZE=normalize
- CDSPEED=eject
- VORBISGAIN=vorbisgain
- MP3GAIN=mp3gain
-diff -up abcde-2.7/abcde.1~ abcde-2.7/abcde.1
---- abcde-2.7/abcde.1~	2015-06-18 15:26:40.000000000 +0300
-+++ abcde-2.7/abcde.1	2015-06-20 22:57:53.084714455 +0300
-@@ -345,7 +345,7 @@ Specifies the style of encoder to use fo
- .TP
- .B NORMALIZERSYNTAX
- Specifies the style of normalizer to use.  Valid options are \'default\'
--and \'normalize'\ (and both run \'normalize-audio\'), since we only support it,
-+and \'normalize'\ (and both run \'normalize\'), since we only support it,
- ATM.
- .TP
- .B CDROMREADERSYNTAX
-@@ -606,7 +606,7 @@ ImageMagick package should be installed.
- (optional) distmp3, a client/server for distributed mp3 encoding.
- .TP
- .B *
--(optional) normalize-audio, a WAV file volume normalizer.
-+(optional) normalize, a WAV file volume normalizer.
- .TP
- .B *
- (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, mpcgain, wvgain),
-@@ -620,7 +620,7 @@ ImageMagick package should be installed.
- .BR cdda2wav (1),
- .BR pird (1),
- .BR dagrab (1),
--.BR normalize-audio (1),
-+.BR normalize (1),
- .BR oggenc (1),
- .BR vorbize (1),
- .BR flac (1),
-diff -up abcde-2.7/abcde.conf~ abcde-2.7/abcde.conf
---- abcde-2.7/abcde.conf~	2015-06-18 15:26:40.000000000 +0300
-+++ abcde-2.7/abcde.conf	2015-06-20 22:57:25.573857690 +0300
-@@ -162,7 +162,7 @@
- #DISTMP3=distmp3
- #VORBISCOMMENT=vorbiscomment
- #METAFLAC=metaflac
--#NORMALIZE=normalize-audio
-+#NORMALIZE=normalize
- #CDSPEED=eject
- #VORBISGAIN=vorbisgain
- #MKCUE=mkcue
-diff -up abcde-2.7/README~ abcde-2.7/README
---- abcde-2.7/README~	2015-06-18 15:26:40.000000000 +0300
-+++ abcde-2.7/README	2015-06-20 22:56:51.829662255 +0300
-@@ -176,7 +176,7 @@ Options added/modified from 2.1.1 to 2.1
- 
- Options added/modified from 2.0.3 to 2.1.x:
- 
--* -b use batch processing. It uses normalize-audio to adjust the volume of
-+* -b use batch processing. It uses normalize to adjust the volume of
-   the songs, and a -g gapless option from lame to remove gaps. Only available
-   for mp3+lame combination.
- * a new "normalize" option has been added to -a, to normalize the volume.
-@@ -225,7 +225,7 @@ abcde requires the following backend too
- * An Opus encoder )opusenc) or:
- * A Monkey's Ausio encoder (mac) or:
- * A WavPack encoder (wavpack)
--* normalize-audio for volume normalization.
-+* normalize for volume normalization.
- * CD Paranoia, an audio CD reading utility or:
- * icedax/cdda2wav, the audio CD reading utility cdparanoia was born from or:
- * cd-paranoia, an audio cd reading utility, courtesy of GNU libcdio or:
diff --git a/abcde-cddbmethod.patch b/abcde-cddbmethod.patch
index 105a7bb..84b1604 100644
--- a/abcde-cddbmethod.patch
+++ b/abcde-cddbmethod.patch
@@ -1,10 +1,10 @@
-diff -up abcde-2.8.1/abcde.conf.orig abcde-2.8.1/abcde.conf
---- abcde-2.8.1/abcde.conf.orig	2017-07-02 16:00:35.009572935 +0200
-+++ abcde-2.8.1/abcde.conf	2017-07-02 16:02:45.003049337 +0200
-@@ -9,7 +9,7 @@
- # is "musicbrainz", but both can be specified in a comma delimited list
- # to be tried sequentially in the event of failure of the first
- # search.
+diff -up abcde-2.9/abcde.conf.method abcde-2.9/abcde.conf
+--- abcde-2.9/abcde.conf.method	2018-03-09 16:32:30.780911417 +0100
++++ abcde-2.9/abcde.conf	2018-03-09 16:33:30.555453030 +0100
+@@ -10,7 +10,7 @@
+ # "cdtext". Default is "musicbrainz", but all can be specified in a
+ # comma delimited list to be tried sequentially. All the results will
+ # be displayed ready for user choice.
 -#CDDBMETHOD=musicbrainz
 +CDDBMETHOD=cddb
  
diff --git a/abcde-normalize.patch b/abcde-normalize.patch
new file mode 100644
index 0000000..1df4384
--- /dev/null
+++ b/abcde-normalize.patch
@@ -0,0 +1,75 @@
+diff -up abcde-2.9/abcde.1.normalize abcde-2.9/abcde.1
+--- abcde-2.9/abcde.1.normalize	2018-03-08 01:22:48.000000000 +0100
++++ abcde-2.9/abcde.1	2018-03-09 16:16:02.405903317 +0100
+@@ -385,7 +385,7 @@ At this point only \'ffmpeg\' is availab
+ .TP
+ .B NORMALIZERSYNTAX
+ Specifies the style of normalizer to use.  Valid options are \'default\'
+-and \'normalize'\ (and both run \'normalize-audio\'), since we only support it,
++and \'normalize'\ (and both run \'normalize\'), since we only support it,
+ ATM.
+ .TP
+ .B CDROMREADERSYNTAX
+@@ -669,7 +669,7 @@ ImageMagick package should be installed.
+ (optional) distmp3, a client/server for distributed mp3 encoding.
+ .TP
+ .B *
+-(optional) normalize-audio, a WAV file volume normalizer.
++(optional) normalize, a WAV file volume normalizer.
+ .TP
+ .B *
+ (optional) a replaygain file volume modifier (vorbisgain, metaflac, mp3gain, mpcgain, wvgain),
+@@ -685,7 +685,7 @@ ImageMagick package should be installed.
+ .BR mid3v2 (1),
+ .BR pird (1),
+ .BR dagrab (1),
+-.BR normalize-audio (1),
++.BR normalize (1),
+ .BR oggenc (1),
+ .BR vorbize (1),
+ .BR flac (1),
+diff -up abcde-2.9/abcde.conf.normalize abcde-2.9/abcde.conf
+--- abcde-2.9/abcde.conf.normalize	2018-03-08 01:22:48.000000000 +0100
++++ abcde-2.9/abcde.conf	2018-03-09 16:16:02.405903317 +0100
+@@ -189,7 +189,7 @@
+ #DISTMP3=distmp3
+ #VORBISCOMMENT=vorbiscomment
+ #METAFLAC=metaflac
+-#NORMALIZE=normalize-audio
++#NORMALIZE=normalize
+ #CDSPEED=eject
+ #VORBISGAIN=vorbisgain
+ #MKCUE=mkcue
+diff -up abcde-2.9/abcde.normalize abcde-2.9/abcde
+--- abcde-2.9/abcde.normalize	2018-03-09 16:16:02.404903308 +0100
++++ abcde-2.9/abcde	2018-03-09 16:16:42.876271969 +0100
+@@ -3890,7 +3890,7 @@ MUSICBRAINZ=abcde-musicbrainz-tool
+ EJECT=eject
+ MD5SUM=md5sum
+ DISTMP3=distmp3
+-NORMALIZE="normalize-audio"
++NORMALIZE="normalize"
+ CDSPEED=eject
+ VORBISGAIN=vorbisgain
+ MP3GAIN=mp3gain
+diff -up abcde-2.9/README.normalize abcde-2.9/README
+--- abcde-2.9/README.normalize	2018-03-08 01:22:48.000000000 +0100
++++ abcde-2.9/README	2018-03-09 16:16:02.405903317 +0100
+@@ -218,7 +218,7 @@ Options added/modified from 2.1.1 to 2.1
+ 
+ Options added/modified from 2.0.3 to 2.1.x:
+ 
+-* -b use batch processing. It uses normalize-audio to adjust the volume of
++* -b use batch processing. It uses normalize to adjust the volume of
+   the songs, and a -g gapless option from lame to remove gaps. Only available
+   for mp3+lame combination.
+ * a new "normalize" option has been added to -a, to normalize the volume.
+@@ -267,7 +267,7 @@ abcde requires the following backend too
+ * An Opus encoder )opusenc) or:
+ * A Monkey's Ausio encoder (mac) or:
+ * A WavPack encoder (wavpack)
+-* normalize-audio for volume normalization.
++* normalize for volume normalization.
+ * CD Paranoia, an audio CD reading utility or:
+ * icedax/cdda2wav, the audio CD reading utility cdparanoia was born from or:
+ * cd-paranoia, an audio cd reading utility, courtesy of GNU libcdio or:
diff --git a/abcde.spec b/abcde.spec
index 124b602..8aa934a 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
-Version:        2.8.1
-Release:        6%{?dist}
+Version:        2.9
+Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
 # cddb-tool is Public Domain, otherwise GPLv2+
@@ -11,7 +11,7 @@ Source1:        https://abcde.einval.com/download/%{name}-%{version}.tar.gz.sign
 # gpg2 --recv-key 0x587979573442684E
 # gpg2 --export --export-options export-minimal 0x587979573442684E > 587979573442684E.gpg
 Source2:        587979573442684E.gpg
-Patch0:         %{name}-2.7-normalize.patch
+Patch0:         %{name}-normalize.patch
 Patch1:         %{name}-cddbmethod.patch
 
 BuildArch:      noarch
@@ -48,9 +48,7 @@ tags them, all in one go.
 
 %prep
 %{_bindir}/gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
-%setup -q
-%patch0 -p1 -F2
-%patch1 -p1
+%autosetup
 mv examples/cue2discid .
 sed -i -e 's|bin/python\b|bin/python3|' cue2discid
 chmod -c -x abcde-musicbrainz-tool examples/musicbrainz-get-tracks
@@ -79,6 +77,11 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, missing perl(Mus
 
 
 %changelog
+* Fri Mar 09 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.9-1
+- update to 2.9 (#1553139)
+- rebase patches
+- use autosetup macro
+
 * Wed Feb 21 2018 Dominik Mierzejewski <rpm@greysector.net> - 2.8.1-6
 - add Suggests for twolame, now that's included in Fedora 27+ (#1534297)
 - verify GPG signature for the source tarball
diff --git a/sources b/sources
index 8fa1f91..c23edaf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (abcde-2.8.1.tar.gz) = 18e9e46ec69d0b99fc5e2b71ec549e3961e5f6d7f88cef1a6c8da154689554a70cc8bc748c1ef78f81583a510f8b03906b8a4fec454aa0b06f0169d0bc4a7b36
-SHA512 (abcde-2.8.1.tar.gz.sign) = c3e6a922ad895b15f41c0b89162c66bb65dce5d822fa0935afcca1def0057a25e14cb25af478d42bbc49dc94c6f62f68dc10ac1989e9dd5e7ae7923af352b2c9
+SHA512 (abcde-2.9.tar.gz) = fea7e59237592777df28badcea1f9510881148c79ca2a90b47605677aa52f07132fe93a2ccdccffc98d31524b2332735511cb648844335bdf42d3ce1c32a0252
+SHA512 (abcde-2.9.tar.gz.sign) = 6c4c794d12b209b6308bdf381b1539922b8af008b4f0ae701b83b14444f006fb4c5f09521f89efbacb9657b0009983fb8e310b828014342f4d12597f4d12aed1