diff -Nru mime-support-3.39/debian/changelog mime-support-3.39/debian/changelog
--- mime-support-3.39/debian/changelog	2006-12-05 03:22:40.000000000 +0000
+++ mime-support-3.39/debian/changelog	2008-03-28 18:47:20.000000000 +0000
@@ -1,3 +1,12 @@
+mime-support (3.39-1ubuntu1) hardy; urgency=low
+
+  * Change the mimetypes for Ogg and flac to those specified by
+    Xiph at
+    http://wiki.xiph.org/index.php/MIME_Types_and_File_Extensions
+    (LP: #201291)
+
+ -- James Westby <james.westby@canonical.com>  Fri, 28 Mar 2008 18:36:56 +0000
+
 mime-support (3.39-1) unstable; urgency=medium
 
   * added new mime.types 
diff -Nru /tmp/4BwXUuyzKI/mime-support-3.39/mime.types /tmp/r6OWwYajEp/mime-support-3.39/mime.types
--- mime-support-3.39/mime.types	2006-12-05 03:21:03.000000000 +0000
+++ mime-support-3.39/mime.types	2008-03-28 18:48:15.000000000 +0000
@@ -81,7 +81,7 @@
 application/ocsp-response
 application/octet-stream			bin
 application/oda					oda
-application/ogg					ogg
+application/ogg					ogx
 application/parityfec
 application/pdf					pdf
 application/pgp-encrypted
@@ -386,7 +386,6 @@
 application/x-dvi				dvi
 application/x-httpd-eruby			rhtml
 application/x-executable
-application/x-flac				flac
 application/x-font				pfa pfb gsf pcf pcf.Z
 application/x-freemind				mm
 application/x-futuresplash			spl
@@ -467,6 +466,7 @@
 audio/32kadpcm
 audio/3gpp
 audio/basic					au snd
+audio/flac					flac
 audio/g.722.1
 audio/l16
 audio/midi					mid midi kar
@@ -474,6 +474,7 @@
 audio/mpa-robust
 audio/mpeg					mpga mpega mp2 mp3 m4a
 audio/mpegurl					m3u
+audio/ogg					oga ogg spx
 audio/parityfec
 audio/prs.sid					sid
 audio/telephone-event
@@ -721,6 +722,7 @@
 video/gl					gl
 video/mpeg					mpeg mpg mpe
 video/mp4					mp4
+video/ogg					ogv
 video/quicktime					qt mov
 video/mp4v-es
 video/parityfec