diff --git a/ChangeLog b/ChangeLog
index 7c0a2b236..4aaa1e9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-04  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mkvmerge: bug fix: The OGM fix in 0.9.0 broke handling for
+	non-broken OGM files a bit.
+
 2004-06-03  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: new feature: Added support for the audio/video
diff --git a/src/input/r_ogm.cpp b/src/input/r_ogm.cpp
index 418354f51..e118a9a54 100644
--- a/src/input/r_ogm.cpp
+++ b/src/input/r_ogm.cpp
@@ -1036,7 +1036,7 @@ ogm_reader_c::process_header_packets(ogm_demuxer_t *dmx) {
 
   while (ogg_stream_packetout(&dmx->os, &op) == 1) {
     if (((dmx->stype != OGM_STREAM_TYPE_VORBIS) || !dmx->native_mode) &&
-        ((op.packet[0] & PACKET_TYPE_BITS) != 1)) {
+        ((op.packet[0] & 1) != 1)) {
       mxwarn("ogm_reader: Missing header/comment packets for stream %d in "
              "'%s'. This file is broken but should be muxed correctly. If "
              "not please contact the author Moritz Bunkus "