diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9374fb10..5f72f835 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1057,7 +1057,8 @@ def description_plain(lines, linkres):
     return ps.text_plain
 
 # Parse multiple lines of description as written in a metadata file, returning
-# a single string in wiki format.
+# a single string in wiki format. Used for the Maintainer Notes field as well,
+# because it's the same format.
 def description_wiki(lines):
     ps = DescriptionFormatter(None)
     for line in lines:
diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 53c590d0..ce2fbf41 100644
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -76,6 +76,10 @@ def update_wiki(apps, apks):
         wikidata += "=Description=\n"
         wikidata += common.description_wiki(app['Description']) + "\n"
 
+        if 'Maintainer Notes' in app:
+            wikidata += "=Maintainer Notes=\n"
+            wikidata += common.description_wiki(app['Maintainer Notes']) + "\n"
+
         # Get a list of all packages for this application...
         apklist = []
         gotcurrentver = False