diff --git a/docs/_includes/docs-nav.html b/docs/_includes/docs-nav.html
new file mode 100644
index 0000000000..9d1d6e91f6
--- /dev/null
+++ b/docs/_includes/docs-nav.html
@@ -0,0 +1,61 @@
+<header class="navbar navbar-static-top bs-docs-sidebar" id="top" role="banner">
+  <div class="container-fluid">
+    <div class="navbar-header">
+      <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-sidenav-collapse">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a href="{{ site.baseurl }}" class="navbar-brand">
+        Bootstrap
+      </a>
+    </div>
+    <nav class="collapse navbar-collapse bs-sidenav-collapse" role="navigation">
+      {% for group in site.data.nav %}
+        {% assign link = group.pages | first %}
+        {% assign slug = group.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-' %}
+        {% assign active = nil %}
+
+        {% if page.url contains slug %}
+          {% assign active = 'active' %}
+        {% endif %}
+
+        <div class="bs-docs-toc-item {{ active }}">
+          <a class="bs-docs-toc-link" href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ link.title | downcase | replace: ' ', '-' || page.title | downcase | replace: ' ', '-'  }}">
+            {{ group.title }}
+          </a>
+
+          <ul class="nav bs-docs-sidenav">
+            {% for doc in group.pages %}
+              {% assign slug = doc.title | downcase | replace: ' ', '-' %}
+              {% assign active = nil %}
+
+              {% if page.url contains slug %}
+                {% assign active = 'active' %}
+              {% endif %}
+
+              <li class="{{ active }}">
+                <a href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' }}">
+                  {{ doc.title }}
+                </a>
+
+                {% unless doc.sections == nil %}
+                  <ul class="nav">
+                    {% for section in doc.sections %}
+                      <li>
+                        <a href="{{ site.baseurl }}{{ group.title | downcase | replace: ' ', '-' }}/{{ doc.title | downcase | replace: ' ', '-' }}#{{ section.title | downcase | replace: ' ', '-' }}">
+                          {{ section.title }}
+                        </a>
+                      </li>
+                    {% endfor %}
+                  </ul>
+                {% endunless %}
+              </li>
+            {% endfor %}
+          </ul>
+        </div>
+      {% endfor %}
+    </nav>
+  </div>
+</header>
diff --git a/docs/_includes/home-nav.html b/docs/_includes/home-nav.html
new file mode 100644
index 0000000000..2f80391b88
--- /dev/null
+++ b/docs/_includes/home-nav.html
@@ -0,0 +1,36 @@
+<header class="navbar navbar-inverse navbar-static-top bs-docs-nav" id="top" role="banner">
+  <div class="container">
+    <div class="navbar-header">
+      <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <a href="../" class="navbar-brand">Bootstrap</a>
+    </div>
+    <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
+      <ul class="nav navbar-nav">
+        <li{% if page.slug == "getting-started" %} class="active"{% endif %}>
+          <a href="../getting-started">Getting started</a>
+        </li>
+        <li{% if page.slug == "css" %} class="active"{% endif %}>
+          <a href="../css">CSS</a>
+        </li>
+        <li{% if page.slug == "components" %} class="active"{% endif %}>
+          <a href="../components">Components</a>
+        </li>
+        <li{% if page.slug == "js" %} class="active"{% endif %}>
+          <a href="../javascript">JavaScript</a>
+        </li>
+        <li{% if page.slug == "customize" %} class="active"{% endif %}>
+          <a href="../customize">Customize</a>
+        </li>
+      </ul>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a href="{{ site.expo }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Expo');">Expo</a></li>
+        <li><a href="{{ site.blog }}" onclick="ga('send', 'event', 'Navbar', 'Community links', 'Blog');">Blog</a></li>
+      </ul>
+    </nav>
+  </div>
+</header>
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index a4092e8f40..829c7c7a65 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -7,7 +7,7 @@
   <body class="bs-docs">
     <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
 
-    {% include nav/docs.html %}
+    {% include docs-nav.html %}
 
     <div class="bs-docs-header" id="content">
       <div class="bs-docs-container">
diff --git a/docs/_layouts/home.html b/docs/_layouts/home.html
index e2ab84b013..9934cb2849 100644
--- a/docs/_layouts/home.html
+++ b/docs/_layouts/home.html
@@ -8,7 +8,7 @@
     <a class="sr-only sr-only-focusable" href="#content">Skip to main content</a>
 
     <!-- Docs master nav -->
-    {% include nav/home.html %}
+    {% include home-nav.html %}
 
     <!-- Page content of course! -->
     {{ content }}