diff --git a/NEWS b/NEWS
index 4d1d146da726f3ddd569221c6b5b56e53bbd91fe..133edf2e02b21591ad3e4fa3353bd2b1d79a739c 100644
--- a/NEWS
+++ b/NEWS
@@ -47,6 +47,12 @@ ver 0.20 (not yet released)
 * update
   - apply .mpdignore matches to subdirectories
 
+ver 0.19.13 (not yet released)
+* tags
+  - aiff, riff: fix ID3 chunk padding
+* decoder
+  - ffmpeg: support the TAK codec
+
 ver 0.19.12 (2015/12/15)
 * fix assertion failure on malformed UTF-8 tag
 * fix build failure on non-Linux systems
diff --git a/src/tag/Aiff.cxx b/src/tag/Aiff.cxx
index 7235b76a8bf7770d5c12da731046994f9ecd8dfe..645320ae2d2fc7f196b61123bfabf8e952d7349a 100644
--- a/src/tag/Aiff.cxx
+++ b/src/tag/Aiff.cxx
@@ -84,14 +84,14 @@ aiff_seek_id3(FILE *file)
 			   underflow when casting to off_t */
 			return 0;
 
-		if (size % 2 != 0)
-			/* pad byte */
-			++size;
-
 		if (memcmp(chunk.id, "ID3 ", 4) == 0)
 			/* found it! */
 			return size;
 
+		if (size % 2 != 0)
+			/* pad byte */
+			++size;
+
 		if (fseek(file, size, SEEK_CUR) != 0)
 			return 0;
 	}
diff --git a/src/tag/Riff.cxx b/src/tag/Riff.cxx
index 7412258133d50b44a214c4600ae6babf6a46bc29..9d79bb56465b03677b8ae35b9ab049107aef2baa 100644
--- a/src/tag/Riff.cxx
+++ b/src/tag/Riff.cxx
@@ -82,15 +82,15 @@ riff_seek_id3(FILE *file)
 			   underflow when casting to off_t */
 			return 0;
 
-		if (size % 2 != 0)
-			/* pad byte */
-			++size;
-
 		if (memcmp(chunk.id, "id3 ", 4) == 0 ||
 		    memcmp(chunk.id, "ID3 ", 4) == 0)
 			/* found it! */
 			return size;
 
+		if (size % 2 != 0)
+			/* pad byte */
+			++size;
+
 		if (fseek(file, size, SEEK_CUR) != 0)
 			return 0;
 	}