Index: freedesktop.org.xml.in
===================================================================
RCS file: /cvs/mime/shared-mime-info/freedesktop.org.xml.in,v
retrieving revision 1.84
diff -u -p -r1.84 freedesktop.org.xml.in
--- freedesktop.org.xml.in	29 Oct 2005 20:19:39 -0000	1.84
+++ freedesktop.org.xml.in	30 Oct 2005 09:12:15 -0000
@@ -1313,8 +1313,58 @@ command to generate the output files.
     </magic>
     <glob pattern="*.o"/>
   </mime-type>
+  <mime-type type="audio/x-vorbis">
+    <sub-class-of type="application/ogg"/>
+    <comment>Ogg Vorbis audio</comment>
+    <magic priority="80">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="\x01vorbis" offset="28"/>
+      </match>
+    </magic>
+    <glob pattern="*.ogg"/>
+  </mime-type>
+  <mime-type type="audio/x-oggflac">
+    <sub-class-of type="application/ogg"/>
+    <comment>Ogg FLAC audio</comment>
+    <magic priority="80">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="fLaC" offset="28"/>
+      </match>
+    </magic>
+    <glob pattern="*.ogg"/>
+  </mime-type>
+  <mime-type type="audio/x-speex">
+    <sub-class-of type="application/ogg"/>
+    <comment>Ogg Speex audio</comment>
+    <magic priority="80">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="Speex  " offset="28"/>
+      </match>
+    </magic>
+    <glob pattern="*.ogg"/>
+  </mime-type>
+  <mime-type type="video/x-theora">
+    <sub-class-of type="application/ogg"/>
+    <comment>Ogg Theora video</comment>
+    <magic priority="80">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="\x80theora" offset="28"/>
+      </match>
+    </magic>
+    <glob pattern="*.ogg"/>
+  </mime-type>
+  <mime-type type="video/x-ogm">
+    <sub-class-of type="application/ogg"/>
+    <comment>OGM video</comment>
+    <magic priority="80">
+      <match type="string" value="OggS" offset="0">
+        <match type="string" value="video" offset="29"/>
+      </match>
+    </magic>
+    <glob pattern="*.ogm"/>
+  </mime-type>
   <mime-type type="application/ogg">
-    <_comment>Ogg Vorbis audio</_comment>
+    <_comment>Ogg multimedia</_comment>
     <magic priority="50">
       <match type="string" value="OggS" offset="0"/>
     </magic>