4 files changed, 22 insertions, 4 deletions
diff --git a/src/decoder/ffmpeg_plugin.c b/src/decoder/ffmpeg_plugin.c
index c702500d7..6d856f293 100644
--- a/src/decoder/ffmpeg_plugin.c
+++ b/src/decoder/ffmpeg_plugin.c
@@ -481,6 +481,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"application/ogg",
 	"application/x-ms-wmz",
 	"application/x-ms-wmd",
+	"application/x-ogg",
 	"application/x-shockwave-flash",
 	"application/x-shorten",
 	"audio/8svx",
@@ -495,6 +496,7 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/ogg",
 	"audio/qcelp",
 	"audio/vorbis",
+	"audio/vorbis+ogg",
 	"audio/x-8svx",
 	"audio/x-16sv",
 	"audio/x-aac",
@@ -512,6 +514,9 @@ static const char *const ffmpeg_mime_types[] = {
 	"audio/x-ms-wma",
 	"audio/x-ms-wax",
 	"audio/x-musepack",
+	"audio/x-ogg",
+	"audio/x-vorbis",
+	"audio/x-vorbis+ogg",
 	"audio/x-pn-realaudio",
 	"audio/x-pn-multirate-realaudio",
 	"audio/x-speex",
diff --git a/src/decoder/flac_plugin.c b/src/decoder/flac_plugin.c
index 50cf1f020..ff1d1af3f 100644
--- a/src/decoder/flac_plugin.c
+++ b/src/decoder/flac_plugin.c
@@ -791,9 +791,11 @@ oggflac_decode(struct decoder *decoder, struct input_stream *input_stream)
 
 static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
 static const char *const oggflac_mime_types[] = {
-	"audio/x-flac+ogg",
 	"application/ogg",
 	"application/x-ogg",
+	"audio/ogg",
+	"audio/x-flac+ogg",
+	"audio/x-ogg",
 	NULL
 };
 
@@ -814,7 +816,11 @@ const struct decoder_plugin oggflac_decoder_plugin = {
 
 static const char *const flac_suffixes[] = { "flac", NULL };
 static const char *const flac_mime_types[] = {
-	"audio/x-flac", "application/x-flac", NULL
+	"application/flac",
+	"application/x-flac",
+	"audio/flac",
+	"audio/x-flac",
+	NULL
 };
 
 const struct decoder_plugin flac_decoder_plugin = {
diff --git a/src/decoder/oggflac_plugin.c b/src/decoder/oggflac_plugin.c
index cff01453c..b8b087b47 100644
--- a/src/decoder/oggflac_plugin.c
+++ b/src/decoder/oggflac_plugin.c
@@ -351,9 +351,11 @@ fail:
 
 static const char *const oggflac_suffixes[] = { "ogg", "oga", NULL };
 static const char *const oggflac_mime_types[] = {
-	"audio/x-flac+ogg",
 	"application/ogg",
 	"application/x-ogg",
+	"audio/ogg",
+	"audio/x-ogg",
+	"audio/x-flac+ogg",
 	NULL
 };
 
diff --git a/src/decoder/vorbis_plugin.c b/src/decoder/vorbis_plugin.c
index f0285de72..b323cf775 100755
--- a/src/decoder/vorbis_plugin.c
+++ b/src/decoder/vorbis_plugin.c
@@ -420,8 +420,13 @@ static const char *const vorbis_suffixes[] = {
 
 static const char *const vorbis_mime_types[] = {
 	"application/ogg",
-	"audio/x-vorbis+ogg",
 	"application/x-ogg",
+	"audio/ogg",
+	"audio/vorbis",
+	"audio/vorbis+ogg",
+	"audio/x-ogg",
+	"audio/x-vorbis",
+	"audio/x-vorbis+ogg",
 	NULL
 };