diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 022be563..5f057e40 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -516,7 +516,7 @@ def get_local_metadata_files():
     '''get any metadata files local to an app's source repo
 
     This tries to ignore anything that does not count as app metdata,
-    including emacs cruft ending in ~ and the .fdroid.key*pass.yml files.
+    including emacs cruft ending in ~
 
     '''
     return glob.glob('.fdroid.[a-jl-z]*[a-rt-z]')
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 2498bb32..60762076 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -941,7 +941,7 @@ def parse_metadata(metadatapath, check_vcs=False, refresh=True):
         with open(metadatapath, 'r') as mf:
             parse_yaml_metadata(mf, app)
     else:
-        warn_or_exception(_('Unknown metadata format: {path}')
+        warn_or_exception(_('Unknown metadata format: {path} (use: .yml)')
                           .format(path=metadatapath))
 
     if check_vcs and app.Repo: