diff --git a/0001-Drop-EXTRAVERBOSE-debugging-noise.patch b/0001-Drop-EXTRAVERBOSE-debugging-noise.patch
new file mode 100644
index 0000000..d7e67f7
--- /dev/null
+++ b/0001-Drop-EXTRAVERBOSE-debugging-noise.patch
@@ -0,0 +1,24 @@
+From 3a8aef3db1c8effa1dc9a5a770dcd38c96169b2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
+Date: Sun, 9 Nov 2014 20:00:40 +0200
+Subject: [PATCH] Drop EXTRAVERBOSE debugging noise
+
+---
+ abcde | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/abcde b/abcde
+index f6bf90d..2d1ecc4 100755
+--- a/abcde
++++ b/abcde
+@@ -3447,7 +3447,6 @@ fi
+ # We used to use EXTRAVERBOSE=y to turn on more debug output. Now
+ # that's changed to a number to allow for more control. Deal with
+ # EXTRAVERBOSE=y/n, set it to 1/0 for backwards compatibility.
+-echo "Looking at EXTRAVERBOSE ($EXTRAVERBOSE)"
+ case "$EXTRAVERBOSE" in
+ 	*y*|*Y*)
+ 		EXTRAVERBOSE=1
+-- 
+1.9.3
+
diff --git a/abcde-2.5.4-eyed3-empty-year.patch b/abcde-2.5.4-eyed3-empty-year.patch
deleted file mode 100644
index 6f64b5a..0000000
--- a/abcde-2.5.4-eyed3-empty-year.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up abcde-2.5.4/abcde.orig abcde-2.5.4/abcde
---- abcde-2.5.4/abcde.orig	2014-04-17 21:56:03.675957914 +0300
-+++ abcde-2.5.4/abcde	2014-04-17 21:56:14.415166223 +0300
-@@ -826,7 +826,7 @@ do_tag ()
- 					# happily substitute them with $TRACKNUM
- 					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
- 						--comment="$COMMENTOUTPUT" -A "$DALBUM" \
--						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
-+						-a "$TRACKARTIST" -t "$TRACKNAME" ${CDYEAR:+-Y "$CDYEAR"} \
- 						-G "$GENREID" -n "${TRACKNUM:-$1}" \
- 						${TRACKNUM:+-N "$TRACKS"} \
- 						${ENCODING:+--encoding="$ENCODING"} \
diff --git a/abcde-2.5.4-eyed3_07-991163.patch b/abcde-2.5.4-eyed3_07-991163.patch
deleted file mode 100644
index a77a879..0000000
--- a/abcde-2.5.4-eyed3_07-991163.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up abcde-2.5.4/abcde~ abcde-2.5.4/abcde
---- abcde-2.5.4/abcde~	2012-09-18 16:09:31.000000000 +0300
-+++ abcde-2.5.4/abcde	2013-08-01 23:58:04.137972845 +0300
-@@ -825,12 +825,12 @@ do_tag ()
- 					# FIXME # track numbers in mp3 come with 1/10, so we cannot
- 					# happily substitute them with $TRACKNUM
- 					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
--						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
-+						--comment="$COMMENTOUTPUT" -A "$DALBUM" \
- 						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
- 						-G "$GENREID" -n "${TRACKNUM:-$1}" \
- 						${TRACKNUM:+-N "$TRACKS"} \
--						${ENCODING:+--set-encoding="$ENCODING"} \
--						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
-+						${ENCODING:+--encoding="$ENCODING"} \
-+						${TPE2:+--text-frame=TPE2:"$TPE2"} \
- 						"$ABCDETEMPDIR/track$1.$OUTPUT"
- 					;;
- 				# FIXME # Still not activated...
-@@ -3879,7 +3879,7 @@ else
- 	TAGGER="$EYED3"
- 	TAGGEROPTS="$ID3V2OPTS"
- 	ID3SYNTAX=eyed3
--	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
-+	TAGGEROPTS="--encoding=utf16 $ID3V2OPTS"
- fi
- 
- # NOGAP is specific to lame. Other encoders fail ...
diff --git a/abcde.spec b/abcde.spec
index 7f3cc50..4d13438 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,18 +1,15 @@
 Name:           abcde
-Version:        2.5.4
-Release:        5%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        A Better CD Encoder
 
 # Public domain after 2010-01-01, see comments in abcde and cddb-tool
 License:        Public Domain
-URL:            http://code.google.com/p/abcde/
-Source0:        http://abcde.googlecode.com/files/%{name}-%{version}.tar.gz
+URL:            http://abcde.einval.com/
+Source0:        http://abcde.einval.com/download/%{name}-%{version}.tar.gz
 Patch0:         %{name}-2.4.0-config.patch
-# http://code.google.com/p/abcde/source/detail?r=379
-# http://code.google.com/p/abcde/issues/detail?id=99
-Patch1:         %{name}-2.5.4-eyed3_07-991163.patch
-# http://code.google.com/p/abcde/issues/detail?id=107
-Patch2:         %{name}-2.5.4-eyed3-empty-year.patch
+# http://git.einval.com/cgi-bin/gitweb.cgi?p=abcde.git;a=patch;h=3a8aef3
+Patch1:         0001-Drop-EXTRAVERBOSE-debugging-noise.patch
 
 BuildArch:      noarch
 Requires:       cd-discid
@@ -32,10 +29,10 @@ tags them, all in one go.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -F2
 %patch1 -p1
-%patch2 -p1
 mv examples/cue2discid .
+chmod -c -x abcde-musicbrainz-tool
 
 
 %build
@@ -49,7 +46,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A
 
 
 %files
-%doc COPYING FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/
+%{!?_licensedir:%global license %%doc}
+%license COPYING
+%doc FAQ KNOWN.BUGS README TODO USEPIPES changelog examples/
 %doc abcde-musicbrainz-tool
 %config(noreplace) %{_sysconfdir}/abcde.conf
 %{_bindir}/abcde
@@ -60,6 +59,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A
 
 
 %changelog
+* Sun Nov  9 2014 Ville Skyttä <ville.skytta@iki.fi> - 2.6-1
+- Update to 2.6
+- Mark COPYING as %%license where applicable
+
 * Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index ab24bea..26a7b44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d761c5a07854ce24748be9aa10100e74  abcde-2.5.4.tar.gz
+c8b91d5c53386cfc4345d9d49f67e1dd  abcde-2.6.tar.gz