diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java
index bf4cd7340..269437122 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/TempApkProvider.java
@@ -123,6 +123,9 @@ public class TempApkProvider extends ApkProvider {
     private void initTable() {
         write().execSQL("DROP TABLE IF EXISTS " + getTableName());
         write().execSQL("CREATE TABLE " + getTableName() + " AS SELECT * FROM " + DBHelper.TABLE_APK);
+        write().execSQL("CREATE INDEX IF NOT EXISTS apk_vercode on " + getTableName() + " (vercode);");
+        write().execSQL("CREATE INDEX IF NOT EXISTS apk_id on " + getTableName() + " (id);");
+        write().execSQL("CREATE INDEX IF NOT EXISTS apk_compatible ON " + getTableName() + " (compatible);");
     }
 
 }
diff --git a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java
index 5949c97e9..e60a8271e 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/TempAppProvider.java
@@ -114,6 +114,9 @@ public class TempAppProvider extends AppProvider {
     private void initTable() {
         write().execSQL("DROP TABLE IF EXISTS " + getTableName());
         write().execSQL("CREATE TABLE " + getTableName() + " AS SELECT * FROM " + DBHelper.TABLE_APP);
+        write().execSQL("CREATE INDEX IF NOT EXISTS app_id ON " + getTableName() + " (id);");
+        write().execSQL("CREATE INDEX IF NOT EXISTS app_upstreamVercode ON " + getTableName() + " (upstreamVercode);");
+        write().execSQL("CREATE INDEX IF NOT EXISTS app_compatible ON " + getTableName() + " (compatible);");
     }
 
     private void commitTable() {