diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 1b4f7589..c4e08fb5 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1051,7 +1051,7 @@ def main():
 
         if bestver == 0:
             if app['Name'] is None:
-                app['Name'] = appid
+                app['Name'] = app['Auto Name'] or appid
             app['icon'] = None
             logging.warn("Application " + appid + " has no packages")
         else: