diff --git a/website/jsdocs/jsdocs.js b/website/jsdocs/jsdocs.js
index a4d763693..16ba47eae 100644
--- a/website/jsdocs/jsdocs.js
+++ b/website/jsdocs/jsdocs.js
@@ -423,7 +423,8 @@ function getClassData(node, state, source, commentsForFile, linesForFile) {
   });
   var data = {
     name: node.id.name,
-    methods: methods
+    docblock: getDocBlock(node, commentsForFile, linesForFile),
+    methods: methods,
   };
   if (node.superClass && node.superClass.type === Syntax.Identifier) {
     data.superClass = node.superClass.name;
diff --git a/website/layout/AutodocsLayout.js b/website/layout/AutodocsLayout.js
index fc54c1431..0707c02f1 100644
--- a/website/layout/AutodocsLayout.js
+++ b/website/layout/AutodocsLayout.js
@@ -328,6 +328,9 @@ var APIDoc = React.createClass({
                   class {cls.name}
                 </Header>
                 <ul>
+                  {cls.docblock && <Marked>
+                    {this.removeCommentsFromDocblock(cls.docblock)}
+                  </Marked>}
                   {this.renderMethods(cls.methods)}
                   {this.renderProperties(cls.properties)}
                 </ul>