diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index 9aebd998..3ffdf5e3 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -88,8 +88,6 @@ regex_checks = {
          "Unnecessary trailing space"),
     ],
     'Summary': [
-        (re.compile(r'^$'),
-         "Summary yet to be filled"),
         (re.compile(r'.*\b(free software|open source)\b.*', re.IGNORECASE),
          "No need to specify that the app is Free Software"),
         (re.compile(r'.*((your|for).*android|android.*(app|device|client|port|version))', re.IGNORECASE),
@@ -102,8 +100,6 @@ regex_checks = {
          "Unnecessary trailing space"),
     ],
     'Description': [
-        (re.compile(r'^No description available$'),
-         "Description yet to be filled"),
         (re.compile(r'\s*[*#][^ .]'),
          "Invalid bulleted list"),
         (re.compile(r'^\s'),
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 9d18c4a3..6ca9aace 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -1225,8 +1225,8 @@ def write_plaintext_metadata(mf, app, w_comment, w_field, w_build):
     mf.write('\n')
     w_field_nonempty('Name')
     w_field_nonempty('Auto Name')
-    w_field_always('Summary')
-    w_field_always('Description', description_txt(app.Description))
+    w_field_nonempty('Summary')
+    w_field_nonempty('Description', description_txt(app.Description))
     mf.write('\n')
     if app.RequiresRoot:
         w_field_always('Requires Root', 'yes')
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index faec9144..6bbaf827 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -703,6 +703,7 @@ def insert_localized_app_metadata(apps):
     """
 
     sourcedirs = glob.glob(os.path.join('build', '[A-Za-z]*', 'fastlane', 'metadata', 'android', '[a-z][a-z]*'))
+    sourcedirs += glob.glob(os.path.join('build', '[A-Za-z]*', 'metadata', '[a-z][a-z]*'))
     sourcedirs += glob.glob(os.path.join('metadata', '[A-Za-z]*', '[a-z][a-z]*'))
 
     for d in sorted(sourcedirs):
@@ -716,15 +717,15 @@ def insert_localized_app_metadata(apps):
                 continue
             locale = segments[-1]
             for f in files:
-                if f == 'full_description.txt':
+                if f in ('description.txt', 'full_description.txt'):
                     _set_localized_text_entry(apps[packageName], locale, 'description',
                                               os.path.join(root, f))
                     continue
-                elif f == 'short_description.txt':
+                elif f in ('summary.txt', 'short_description.txt'):
                     _set_localized_text_entry(apps[packageName], locale, 'summary',
                                               os.path.join(root, f))
                     continue
-                elif f == 'title.txt':
+                elif f in ('name.txt', 'title.txt'):
                     _set_localized_text_entry(apps[packageName], locale, 'name',
                                               os.path.join(root, f))
                     continue