diff --git a/metadata.c b/metadata.c
index ab5846f..a46b5c5 100644
--- a/metadata.c
+++ b/metadata.c
@@ -185,6 +185,11 @@ GetAudioMetadata(const char * path, char * name)
 		strcpy(type, "wav");
 		strcpy(mime, "audio/x-wav");
 	}
+	else if( ends_with(path, ".ogg") )
+	{
+		strcpy(type, "ogg");
+		strcpy(mime, "application/ogg");
+	}
 	else
 	{
 		DPRINTF(E_WARN, L_GENERAL, "Unhandled file extension on %s\n", path);
diff --git a/utils.c b/utils.c
index 8783e81..b0afc3e 100644
--- a/utils.c
+++ b/utils.c
@@ -195,7 +195,7 @@ is_audio(const char * file)
 		ends_with(file, ".fla") || ends_with(file, ".flc")  ||
 		ends_with(file, ".m4a") || ends_with(file, ".aac")  ||
 		ends_with(file, ".mp4") || ends_with(file, ".m4p")  ||
-		ends_with(file, ".wav"));
+		ends_with(file, ".wav") || ends_with(file, ".ogg"));
 }
 
 int