diff --git a/lib/core/DocsLayout.js b/lib/core/DocsLayout.js
index 30f11410ae..9edd745a37 100644
--- a/lib/core/DocsLayout.js
+++ b/lib/core/DocsLayout.js
@@ -18,6 +18,10 @@ class DocsLayout extends React.Component {
     const metadata = this.props.metadata;
     const content = this.props.children;
     const i18n = translation[this.props.metadata.language];
+    let DocComponent = Doc;
+    if (this.props.Doc) {
+      DocComponent = this.props.Doc;
+    }
     return (
       <Site
         config={this.props.config}
@@ -36,7 +40,8 @@ class DocsLayout extends React.Component {
         <div className="docMainWrapper wrapper">
           <DocsSidebar metadata={metadata} />
           <Container className="mainContainer">
-            <Doc
+            <DocComponent
+              metadata={metadata}
               content={content}
               config={this.props.config}
               source={metadata.source}
diff --git a/lib/server/server.js b/lib/server/server.js
index 27469500e7..f849a631da 100644
--- a/lib/server/server.js
+++ b/lib/server/server.js
@@ -212,8 +212,17 @@ function execute(port) {
 
     removeModuleAndChildrenFromCache("../core/DocsLayout.js");
     const DocsLayout = require("../core/DocsLayout.js");
+
+    let Doc;
+    if (metadata.layout && siteConfig.layouts[metadata.layout]) {
+      Doc = siteConfig.layouts[metadata.layout]({
+        React,
+        Marked: require("../core/Marked.js")
+      });
+    }
+
     const docComp = (
-      <DocsLayout metadata={metadata} language={language} config={siteConfig}>
+      <DocsLayout metadata={metadata} language={language} config={siteConfig} Doc={Doc}>
         {rawContent}
       </DocsLayout>
     );