diff --git a/NEWS b/NEWS
index 69121ac7f..d67bbb26a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 ver 0.21.12 (not yet released)
 * decoder
   - opus: ignore case in replay gain tag names
+  - opus, vorbis: decode the "end of stream" packet
 * Windows
   - support backslash in relative URIs loaded from playlists
 
diff --git a/src/lib/xiph/OggVisitor.cxx b/src/lib/xiph/OggVisitor.cxx
index b975d8d17..04a02469f 100644
--- a/src/lib/xiph/OggVisitor.cxx
+++ b/src/lib/xiph/OggVisitor.cxx
@@ -69,12 +69,12 @@ OggVisitor::HandlePacket(const ogg_packet &packet)
 		/* fail if BOS is missing */
 		throw std::runtime_error("BOS packet expected");
 
+	OnOggPacket(packet);
+
 	if (packet.e_o_s) {
 		EndStream();
 		return;
 	}
-
-	OnOggPacket(packet);
 }
 
 inline void