diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 85a75def..38dcdeb7 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -528,12 +528,12 @@ def make_index(apps, apks, repodir, archive, categories):
                 common.description_html(app['Description'], linkres), doc, apel)
         addElement('license', app['License'], doc, apel)
         if 'Categories' in app:
-            categories = [c.strip() for c in app['Categories'].split(',')]
-            addElement('categories', ','.join(categories), doc, apel)
+            appcategories = [c.strip() for c in app['Categories'].split(',')]
+            addElement('categories', ','.join(appcategories), doc, apel)
             # We put the first (primary) category in LAST, which will have
             # the desired effect of making clients that only understand one
             # category see that one.
-            addElement('category', categories[0], doc, apel)
+            addElement('category', appcategories[0], doc, apel)
         addElement('web', app['Web Site'], doc, apel)
         addElement('source', app['Source Code'], doc, apel)
         addElement('tracker', app['Issue Tracker'], doc, apel)
@@ -731,7 +731,7 @@ def main():
     # Generate a list of categories...
     categories = []
     for app in apps:
-        cats = app['Category'].split(';')
+        cats = app['Categories'].split(',')
         for cat in cats:
             if cat not in categories:
                 categories.append(cat)