diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 528a9dbf..6664ce69 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -933,7 +933,8 @@ def parse_androidmanifests(paths):
         gradle = path.endswith("gradle")
         version = None
         vercode = None
-        package = None
+        # Remember package name, may be defined separately from version+vercode
+        package = max_package
 
         for line in file(path):
             if not package:
@@ -958,6 +959,10 @@ def parse_androidmanifests(paths):
                 if matches:
                     vercode = matches.group(1)
 
+        # Better some package name than nothing
+        if max_package is None:
+            max_package = package
+
         if max_vercode is None or (vercode is not None and vercode > max_vercode):
             max_version = version
             max_vercode = vercode