diff --git a/db_structure.xml b/db_structure.xml
index 00866b6ebafd2f739b025a72ace3c353ee38fcef..b35a6c7cdc2b193d9d7d9063f3aafc1c083dcad2 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -35,6 +35,18 @@
 				<notnull>true</notnull>
 			</field>
 
+			<index>
+				<name>appconfig_appid_key_index</name>
+				<field>
+					<name>appid</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>configkey</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 
 	</table>
@@ -392,6 +404,22 @@
 				<notnull>false</notnull>
 			</field>
 
+			<index>
+				<name>preferences_userid_appid_key_index</name>
+				<field>
+					<name>userid</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>appid</name>
+					<sorting>ascending</sorting>
+				</field>
+				<field>
+					<name>configkey</name>
+					<sorting>ascending</sorting>
+				</field>
+			</index>
+
 		</declaration>
 
 	</table>
diff --git a/lib/util.php b/lib/util.php
index d0ea1591298e0276736a104c3c15637129e1ab58..08412464254446330b2deff43d23f4156f266fad 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ class OC_Util {
 	 */
 	public static function getVersion() {
 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
-		return array(4,84,9);
+		return array(4,84,10);
 	}
 
 	/**