diff --git a/apps/media/appinfo/database.xml b/apps/media/appinfo/database.xml
index 223682fcfcd..702ae9c28b4 100644
--- a/apps/media/appinfo/database.xml
+++ b/apps/media/appinfo/database.xml
@@ -45,6 +45,30 @@
     <notnull>true</notnull>
     <length>200</length>
    </field>
+   
+   <index>
+	   <name>album_index</name>
+	   <field>
+		   <name>album_id</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+   
+   <index>
+	   <name>album_name_index</name>
+	   <field>
+		   <name>album_name</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+   
+   <index>
+	   <name>album_artist_index</name>
+	   <field>
+		   <name>album_artist</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
 
   </declaration>
 
@@ -81,6 +105,21 @@
      <sorting>ascending</sorting>
     </field>
    </index>
+   
+   <index>
+	   <name>artist_index</name>
+	   <field>
+		   <name>artist_id</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+   <index>
+	   <name>artist_name_index</name>
+	   <field>
+		   <name>artist_name</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
 
   </declaration>
 
@@ -223,6 +262,36 @@
 	   <notnull>true</notnull>
 	   <length>4</length>
    </field>
+   
+   <index>
+	   <name>song_index</name>
+	   <field>
+		   <name>song_id</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+   <index>
+	   <name>song_album_index</name>
+	   <field>
+		   <name>song_album</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+   <index>
+	   <name>song_artist_index</name>
+	   <field>
+		   <name>song_artist</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+   <index>
+	   <name>song_name_index</name>
+	   <field>
+		   <name>song_name</name>
+		   <sorting>ascending</sorting>
+	   </field>
+   </index>
+   
 
   </declaration>
 
diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml
index 795c9a4dd71..4a642bf889d 100644
--- a/apps/media/appinfo/info.xml
+++ b/apps/media/appinfo/info.xml
@@ -3,7 +3,7 @@
 	<id>media</id>
 	<name>Media</name>
 	<description>Media player and server for ownCloud</description>
-	<version>0.2</version>
+	<version>0.3</version>
 	<licence>AGPL</licence>
 	<author>Robin Appelman</author>
 	<require>2</require>