diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 71c4e430..097513bf 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -1670,7 +1670,7 @@ def create_metadata_from_template(apk):
         with open('template.yml') as f:
             metatxt = f.read()
         if 'name' in apk and apk['name'] != '':
-            metatxt = re.sub(r'^(((Auto)?Name|Summary):).*$',
+            metatxt = re.sub(r'''^(((Auto)?Name|Summary):)[ '"\.]*$''',
                              r'\1 ' + apk['name'],
                              metatxt,
                              flags=re.IGNORECASE | re.MULTILINE)