diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9dbc8b00..a49e069d 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -175,7 +175,7 @@ def apknameinfo(filename):
     global apk_regex
     filename = os.path.basename(filename)
     if apk_regex is None:
-        apk_regex = re.compile(r"^([a-zA-Z0-9\.]+)_([0-9]+)\.apk$")
+        apk_regex = re.compile(r"^(.+)_([0-9]+)\.apk$")
     m = apk_regex.match(filename)
     try:
         result = (m.group(1), m.group(2))