diff --git a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
index 5de7f6aea..72dcebf57 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/DBHelper.java
@@ -34,6 +34,7 @@ import android.util.Log;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
 import org.fdroid.fdroid.data.Schema.ApkTable;
+import org.fdroid.fdroid.data.Schema.CatJoinTable;
 import org.fdroid.fdroid.data.Schema.PackageTable;
 import org.fdroid.fdroid.data.Schema.AppPrefsTable;
 import org.fdroid.fdroid.data.Schema.AppMetadataTable;
@@ -145,6 +146,18 @@ class DBHelper extends SQLiteOpenHelper {
             + AppPrefsTable.Cols.IGNORE_ALL_UPDATES + " INT NOT NULL "
             + " );";
 
+    private static final String CREATE_TABLE_CATEGORY = "CREATE TABLE " + Schema.CategoryTable.NAME
+            + " ( "
+            + Schema.CategoryTable.Cols.NAME + " TEXT NOT NULL "
+            + " );";
+
+    private static final String CREATE_TABLE_CAT_JOIN = "CREATE TABLE " + CatJoinTable.NAME
+            + " ( "
+            + CatJoinTable.Cols.APP_METADATA_ID + " INT NOT NULL, "
+            + CatJoinTable.Cols.CATEGORY_ID + " INT NOT NULL, "
+            + "primary key(" + CatJoinTable.Cols.CATEGORY_ID + ", " + CatJoinTable.Cols.APP_METADATA_ID + ") "
+            + " );";
+
     private static final String CREATE_TABLE_INSTALLED_APP = "CREATE TABLE " + InstalledAppTable.NAME
             + " ( "
             + InstalledAppTable.Cols.PACKAGE_NAME + " TEXT NOT NULL PRIMARY KEY, "
@@ -157,7 +170,7 @@ class DBHelper extends SQLiteOpenHelper {
             + InstalledAppTable.Cols.HASH + " TEXT NOT NULL"
             + " );";
 
-    protected static final int DB_VERSION = 64;
+    protected static final int DB_VERSION = 65;
 
     private final Context context;
 
@@ -172,6 +185,8 @@ class DBHelper extends SQLiteOpenHelper {
         db.execSQL(CREATE_TABLE_PACKAGE);
         db.execSQL(CREATE_TABLE_APP_METADATA);
         db.execSQL(CREATE_TABLE_APK);
+        db.execSQL(CREATE_TABLE_CATEGORY);
+        db.execSQL(CREATE_TABLE_CAT_JOIN);
         db.execSQL(CREATE_TABLE_INSTALLED_APP);
         db.execSQL(CREATE_TABLE_REPO);
         db.execSQL(CREATE_TABLE_APP_PREFS);
@@ -234,6 +249,23 @@ class DBHelper extends SQLiteOpenHelper {
         supportRepoPushRequests(db, oldVersion);
         migrateToPackageTable(db, oldVersion);
         addObbFiles(db, oldVersion);
+        addCategoryTables(db, oldVersion);
+    }
+
+    /**
+     * It is possible to correctly migrate categories from the previous `categories` column in
+     * app metadata to the new join table without destroying any data and requiring a repo update.
+     * However, in practice other code since the previous stable has already reset the transient
+     * tables and forced a repo update, so it is much easier to do the same here. It wont have any
+     * negative impact on those upgrading from the previous stable. If there was a number of solid
+     * alpha releases before this, then a proper migration would've be in order.
+     */
+    private void addCategoryTables(SQLiteDatabase db, int oldVersion) {
+        if (oldVersion >= 65) {
+            return;
+        }
+
+        resetTransient(db);
     }
 
     private void addObbFiles(SQLiteDatabase db, int oldVersion) {
@@ -823,15 +855,26 @@ class DBHelper extends SQLiteOpenHelper {
 
         db.beginTransaction();
         try {
+            if (tableExists(db, Schema.CategoryTable.NAME)) {
+                db.execSQL("DROP TABLE " + Schema.CategoryTable.NAME);
+            }
+
+            if (tableExists(db, CatJoinTable.NAME)) {
+                db.execSQL("DROP TABLE " + CatJoinTable.NAME);
+            }
+
             if (tableExists(db, PackageTable.NAME)) {
                 db.execSQL("DROP TABLE " + PackageTable.NAME);
             }
 
             db.execSQL("DROP TABLE " + AppMetadataTable.NAME);
             db.execSQL("DROP TABLE " + ApkTable.NAME);
+
             db.execSQL(CREATE_TABLE_PACKAGE);
             db.execSQL(CREATE_TABLE_APP_METADATA);
             db.execSQL(CREATE_TABLE_APK);
+            db.execSQL(CREATE_TABLE_CATEGORY);
+            db.execSQL(CREATE_TABLE_CAT_JOIN);
             clearRepoEtags(db);
             ensureIndexes(db);
             db.setTransactionSuccessful();
diff --git a/app/src/main/java/org/fdroid/fdroid/data/Schema.java b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
index ded9e567f..7deb04595 100644
--- a/app/src/main/java/org/fdroid/fdroid/data/Schema.java
+++ b/app/src/main/java/org/fdroid/fdroid/data/Schema.java
@@ -59,6 +59,46 @@ public interface Schema {
         }
     }
 
+    interface CategoryTable {
+
+        String NAME = "fdroid_category";
+
+        interface Cols {
+            String ROW_ID = "rowid";
+            String NAME = "name";
+
+            String[] ALL = {
+                    ROW_ID, NAME,
+            };
+        }
+    }
+
+    /**
+     * An entry in this table signifies that an app is in a particular category. Each repo can
+     * classify its apps in separate categories, and so the same record in {@link PackageTable}
+     * can be in the same category multiple times, if multiple repos think that is the case.
+     * @see CategoryTable
+     * @see AppMetadataTable
+     */
+    interface CatJoinTable {
+
+        String NAME = "fdroid_categoryAppMetadataJoin";
+
+        interface Cols {
+            /**
+             * Foreign key to {@link AppMetadataTable}.
+             * @see AppMetadataTable
+             */
+            String APP_METADATA_ID = "appMetadataId";
+
+            /**
+             * Foreign key to {@link CategoryTable}.
+             * @see CategoryTable
+             */
+            String CATEGORY_ID = "categoryId";
+        }
+    }
+
     interface AppMetadataTable {
 
         String NAME = "fdroid_app";