diff --git a/abcde-2.5.4-eyed3_07-991163.patch b/abcde-2.5.4-eyed3_07-991163.patch
new file mode 100644
index 0000000..a77a879
--- /dev/null
+++ b/abcde-2.5.4-eyed3_07-991163.patch
@@ -0,0 +1,28 @@
+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 6d45bc1..af2caca 100644
--- a/abcde.spec
+++ b/abcde.spec
@@ -1,6 +1,6 @@
 Name:           abcde
 Version:        2.5.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A Better CD Encoder
 
 # Public domain after 2010-01-01, see comments in abcde and cddb-tool
@@ -8,6 +8,9 @@ License:        Public Domain
 URL:            http://code.google.com/p/abcde/
 Source0:        http://abcde.googlecode.com/files/%{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
 
 BuildArch:      noarch
 Requires:       cd-discid
@@ -17,6 +20,7 @@ Requires:       icedax
 Requires:       vorbis-tools
 Requires:       wget
 Requires:       which
+Conflicts:      python-eyed3 < 0.7.0
 
 %description
 abcde is a front end command line utility (actually, a shell script)
@@ -27,6 +31,7 @@ tags them, all in one go.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 mv examples/cue2discid .
 
 
@@ -52,6 +57,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/abcde-musicbrainz-tool # optional, some deps N/A
 
 
 %changelog
+* Thu Aug  1 2013 Ville Skyttä <ville.skytta@iki.fi> - 2.5.4-3
+- Apply upstream + --comment fixes for eyeD3 >= 0.7.0 (#991163).
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild