diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index beeb27d5bc..e7c18536f4 100644
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -43,8 +43,7 @@ ogm_header(AVFormatContext *s, int idx)
 
     if(!(*p & 1))
         return 0;
-    if(*p != 1)
-        return 1;
+    if(*p == 1) {
 
     p++;
 
@@ -93,6 +92,10 @@ ogm_header(AVFormatContext *s, int idx)
         st->time_base.num = 1;
         st->time_base.den = st->codec->sample_rate;
     }
+    } else if (*p == 3) {
+        if (os->psize > 8)
+            ff_vorbis_comment(s, &st->metadata, p+7, os->psize-8);
+    }
 
     return 1;
 }