diff --git a/utils/doclint/check_public_api/MDBuilder.js b/utils/doclint/check_public_api/MDBuilder.js
index 1bc338a036..b3b5645b5a 100644
--- a/utils/doclint/check_public_api/MDBuilder.js
+++ b/utils/doclint/check_public_api/MDBuilder.js
@@ -30,9 +30,8 @@ class MDOutline {
     const writer = new commonmark.HtmlRenderer();
     const html = writer.render(parsed);
 
-    page.on('console', msg => {
-      console.log(msg.text());
-    });
+    const logConsole = msg => console.log(msg.text());
+    page.on('console', logConsole);
     // Extract headings.
     await page.setContent(html);
     const {classes, errors} = await page.evaluate(() => {
@@ -56,9 +55,11 @@ class MDOutline {
         const name = str.substring(0, str.indexOf('<')).replace(/\`/g, '').trim();
         const type = findType(str);
         const properties = [];
-        const comment = str.substring(str.indexOf('<') + type.length + 2).trim();
+        let comment = str.substring(str.indexOf('<') + type.length + 2).trim();
         const hasNonEnumProperties = type.split('|').some(part => {
-          return part !== 'string' && part !== 'number' && part !== 'Array<string>' && !(part[0] === '"' && part[part.length - 1] === '"');
+          const basicTypes = new Set(['string', 'number', 'boolean']);
+          const arrayTypes = new Set([...basicTypes].map(type => `Array<${type}>`));
+          return !basicTypes.has(part) && !arrayTypes.has(part) && !(part.startsWith('"') && part.endsWith('"'));
         });
         if (hasNonEnumProperties) {
           for (const childElement of element.querySelectorAll(':scope > ul > li')) {
@@ -77,6 +78,8 @@ class MDOutline {
               property.required = true;
             properties.push(property);
           }
+        } else if (ul) {
+          comment += '\n' + parseComment(ul).split('\n').map(l => ` - ${l}`).join('\n');
         }
         return {
           name,
@@ -214,6 +217,7 @@ class MDOutline {
         return fragment;
       }
     });
+    page.off('console', logConsole);
     return new MDOutline(classes, errors);
   }
 
diff --git a/utils/doclint/check_public_api/test/md-builder-comments/doc.md b/utils/doclint/check_public_api/test/md-builder-comments/doc.md
new file mode 100644
index 0000000000..0fb5f63e1c
--- /dev/null
+++ b/utils/doclint/check_public_api/test/md-builder-comments/doc.md
@@ -0,0 +1,15 @@
+### class: Foo
+
+#### foo.method(arg1, arg2)
+- `arg1` <[string]> A single line argument comment
+- `arg2` <[string]> A multiline argument comment:
+  - it could be this
+  - or it could be that
+- returns: <[Promise]<[ElementHandle]>>
+
+The method does something.
+
+[string]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#String_type "String"
+[Promise]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise "Promise"
+[ElementHandle]: # "ElementHandle"
+[ElementHandle]: # "Frame"
diff --git a/utils/doclint/check_public_api/test/md-builder-comments/result.txt b/utils/doclint/check_public_api/test/md-builder-comments/result.txt
new file mode 100644
index 0000000000..8b78ebca3b
--- /dev/null
+++ b/utils/doclint/check_public_api/test/md-builder-comments/result.txt
@@ -0,0 +1,35 @@
+{
+  "classes": [
+    {
+      "name": "Foo",
+      "members": [
+        {
+          "name": "method",
+          "type": {
+            "name": "Promise<ElementHandle>"
+          },
+          "kind": "method",
+          "comment": "The method does something.",
+          "args": [
+            {
+              "name": "arg1",
+              "type": {
+                "name": "string"
+              },
+              "kind": "property",
+              "comment": "A single line argument comment"
+            },
+            {
+              "name": "arg2",
+              "type": {
+                "name": "string"
+              },
+              "kind": "property",
+              "comment": "A multiline argument comment:\n - it could be this\n - or it could be that"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/utils/doclint/check_public_api/test/md-builder-common/result.txt b/utils/doclint/check_public_api/test/md-builder-common/result.txt
index 46c065f26b..8c9694baff 100644
--- a/utils/doclint/check_public_api/test/md-builder-common/result.txt
+++ b/utils/doclint/check_public_api/test/md-builder-common/result.txt
@@ -2,13 +2,15 @@
   "classes": [
     {
       "name": "Foo",
+      "comment": "This is a class.",
       "members": [
         {
           "name": "frame",
           "type": {
             "name": "[Frame]"
           },
-          "kind": "event"
+          "kind": "event",
+          "comment": "This event is dispatched."
         },
         {
           "name": "$",
@@ -16,13 +18,15 @@
             "name": "Promise<ElementHandle>"
           },
           "kind": "method",
+          "comment": "The method runs document.querySelector.",
           "args": [
             {
               "name": "selector",
               "type": {
                 "name": "string"
               },
-              "kind": "property"
+              "kind": "property",
+              "comment": "A selector to query page for"
             }
           ]
         },
@@ -31,7 +35,8 @@
           "type": {
             "name": "string"
           },
-          "kind": "property"
+          "kind": "property",
+          "comment": "Contains the URL of the request."
         }
       ]
     }
diff --git a/utils/doclint/check_public_api/test/test.js b/utils/doclint/check_public_api/test/test.js
index 5fee72c42c..50022d1d91 100644
--- a/utils/doclint/check_public_api/test/test.js
+++ b/utils/doclint/check_public_api/test/test.js
@@ -55,6 +55,7 @@ describe('checkPublicAPI', function() {
   it('js-builder-common', testJSBuilder);
   it('js-builder-inheritance', testJSBuilder);
   it('md-builder-common', testMDBuilder);
+  it('md-builder-comments', testMDBuilder);
 });
 
 runner.run();
@@ -101,6 +102,7 @@ function serialize(doc) {
   const result = {
     classes: doc.classesArray.map(cls => ({
       name: cls.name,
+      comment: cls.comment || undefined,
       members: cls.membersArray.map(serializeMember)
     }))
   };
@@ -114,6 +116,7 @@ function serializeMember(member) {
     name: member.name,
     type: serializeType(member.type),
     kind: member.kind,
+    comment: member.comment || undefined,
     args: member.argsArray.length ? member.argsArray.map(serializeMember) : undefined
   }
 }