diff --git a/ci/jenkins/bin/docs.sh b/ci/jenkins/bin/docs.sh
index dbff60aabca..6754040a8c8 100644
--- a/ci/jenkins/bin/docs.sh
+++ b/ci/jenkins/bin/docs.sh
@@ -28,7 +28,7 @@ cd doc
 
 echo "Building English version"
 rm -rf docbuild/html
-${ATS_MAKE} html
+${ATS_MAKE} -e SPHINXOPTS="-D language='en'" html
 [ $? != 0 ] && exit 1
 /usr/bin/rsync --delete -av docbuild/html/ /home/docs/en/${ATS_BRANCH}
 
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
new file mode 100644
index 00000000000..3033ee8dcad
--- /dev/null
+++ b/doc/_templates/layout.html
@@ -0,0 +1,41 @@
+{#
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+#}
+{% extends "!layout.html" %}
+{% block footer %}
+<div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
+  <span class="rst-current-version" data-toggle="rst-current-version">
+    <span class="fa fa-book"> Apache Traffic Server</span>
+    v: {{ version }}
+    <span class="fa fa-caret-down"></span>
+  </span>
+  <div class="rst-other-versions">
+    <dl>
+      <dt>Languages</dt>
+      <dd><a href="/en/latest/">English</a></dd>
+      <dd><a href="/ja/latest/">日本語</a></dd>
+    </dl>
+    <dl>
+      <dt>Versions</dt>
+      <dd><a href="/{{ language }}/latest/">latest</a></dd>
+      <dd><a href="/{{ language }}/6.2.x/">6.2.x</a></dd>
+      <dd><a href="/{{ language }}/5.3.x/">5.3.x</a></dd>
+    </dl>
+  </div>
+</div>
+{{ super() }}
+{% endblock %}
diff --git a/doc/static/override.css b/doc/static/override.css
index 1ab1e713768..b7940a31929 100644
--- a/doc/static/override.css
+++ b/doc/static/override.css
@@ -23,3 +23,8 @@ dd {
 span.pre {
     line-height: initial;
 }
+
+/* Fix for nav bottom padding with flyout */
+nav.wy-nav-side {
+    padding-bottom: 3em;
+}