diff --git a/fdroidserver/lint.py b/fdroidserver/lint.py
index ab326513..550216c5 100644
--- a/fdroidserver/lint.py
+++ b/fdroidserver/lint.py
@@ -173,7 +173,7 @@ def main():
         # Invalid lists
         desc_chars = 0
         for line in app['Description']:
-            if re.match(r'[ ]*\*[^ ]', line):
+            if re.match(r'[ ]*[*#][^ .]', line):
                 warn("Invalid bulleted list: '%s'" % line)
             desc_chars += len(line)
 
diff --git a/fdroidserver/metadata.py b/fdroidserver/metadata.py
index 3da4b0c9..6274210c 100644
--- a/fdroidserver/metadata.py
+++ b/fdroidserver/metadata.py
@@ -311,22 +311,22 @@ class DescriptionFormatter:
         self.text_wiki += "%s\n" % line
         if not line:
             self.endcur()
-        elif line.startswith('*'):
+        elif line.startswith('* '):
             self.endcur([self.stUL])
             if self.state != self.stUL:
                 self.text_html += '<ul>'
                 self.state = self.stUL
             self.text_html += '<li>'
-            self.text_plain += '*'
+            self.text_plain += '* '
             self.addtext(line[1:])
             self.text_html += '</li>'
-        elif line.startswith('#'):
+        elif line.startswith('# '):
             self.endcur([self.stOL])
             if self.state != self.stOL:
                 self.text_html += '<ol>'
                 self.state = self.stOL
             self.text_html += '<li>'
-            self.text_plain += '*' #TODO: lazy - put the numbers in!
+            self.text_plain += '* ' #TODO: lazy - put the numbers in!
             self.addtext(line[1:])
             self.text_html += '</li>'
         else: