Merged from the patch in the Debian packages.  The other half of that
patch was already fixed in e52622ed.

And make a sentence out of "contains multiple Vorbis" while we're here.