diff --git a/src/org/fdroid/fdroid/DB.java b/src/org/fdroid/fdroid/DB.java
index 3434ec927..801a5be43 100644
--- a/src/org/fdroid/fdroid/DB.java
+++ b/src/org/fdroid/fdroid/DB.java
@@ -631,7 +631,7 @@ public class DB {
         Cursor c = null;
         try {
             c = db.query(true, TABLE_APP, new String[] { "categories" },
-                    null, null, null, null, "categories", null);
+                    null, null, null, null, null, null);
             c.moveToFirst();
             while (!c.isAfterLast()) {
                 CommaSeparatedList categories = CommaSeparatedList
@@ -652,6 +652,7 @@ public class DB {
                 c.close();
             }
         }
+        Collections.sort(result);
         return result;
     }
 
diff --git a/src/org/fdroid/fdroid/RepoXMLHandler.java b/src/org/fdroid/fdroid/RepoXMLHandler.java
index d691f93eb..0cbf70bc7 100644
--- a/src/org/fdroid/fdroid/RepoXMLHandler.java
+++ b/src/org/fdroid/fdroid/RepoXMLHandler.java
@@ -231,7 +231,7 @@ public class RepoXMLHandler extends DefaultHandler {
                 } catch (NumberFormatException ex) {
                     curapp.curVercode = -1;
                 }
-            } else if (curel.equals("category")) {
+            } else if (curel.equals("categories")) {
                 curapp.categories = DB.CommaSeparatedList.make(str);
             } else if (curel.equals("antifeatures")) {
                 curapp.antiFeatures = DB.CommaSeparatedList.make(str);