diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 3596d522..f014d1f0 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -1024,8 +1024,14 @@ def write_yaml(mf, app):
         return builds
 
     yaml_app_field_order = [
+        'Disabled',
+        'AnitFeatures',
+        'Provides',
         'Categories',
         'License',
+        'AuthorName',
+        'AuthorEmail',
+        'AuthorWebSite',
         'WebSite',
         'SourceCode',
         'IssueTracker',
@@ -1033,21 +1039,34 @@ def write_yaml(mf, app):
         'Donate',
         'FlattrID',
         'Bitcoin',
+        'Litecoin',
         '\n',
+        'Name',
         'AutoName',
         'Summary',
         'Description',
         '\n',
+        'RequiresRoot',
+        '\n',
         'RepoType',
         'Repo',
+        'Binaries',
         '\n',
         'Builds',
         '\n',
+        'MaintainerNotes',
+        '\n',
         'ArchivePolicy',
         'AutoUpdateMode',
         'UpdateCheckMode',
+        'UpdateCheckIgnore',
+        'VercodeOperation',
+        'UpdateCheckName',
+        'UpdateCheckData',
         'CurrentVersion',
         'CurrentVersionCode',
+        '\n',
+        'NoSourceSince',
     ]
 
     yaml_app = _app_to_yaml(app)