diff --git a/openstackdocstheme/theme/openstackdocs/js.html b/openstackdocstheme/theme/openstackdocs/js.html
new file mode 100644
index 00000000..5fca7b30
--- /dev/null
+++ b/openstackdocstheme/theme/openstackdocs/js.html
@@ -0,0 +1,5 @@
+{%- for jsfile in script_files %}
+{% if jsfile not in ('_static/jquery.js', '_static/underscore.js', '_static/doctools.js') %}
+<script src="{{ pathto(jsfile, 1) }}" type="text/javascript"></script>
+{% endif %}
+{%- endfor %}
diff --git a/openstackdocstheme/theme/openstackdocs/layout.html b/openstackdocstheme/theme/openstackdocs/layout.html
index f6cdae72..767b497a 100644
--- a/openstackdocstheme/theme/openstackdocs/layout.html
+++ b/openstackdocstheme/theme/openstackdocs/layout.html
@@ -11,9 +11,6 @@
 {% include 'css.html' %}
 {%- for cssfile in css_files %}
 <link rel="stylesheet" href="{{ pathto(cssfile, 1) }}" type="text/css" />
-{%- endfor %}
-{%- for jsfile in js_files %}
-<script src="{{ pathto(jsfile, 1) }}" type="text/javascript" />
 {%- endfor %}
   {# FAVICON #}
 {% if favicon %}
@@ -81,5 +78,6 @@ ga('send', 'pageview');
     </div>
 {% include 'footer.html' %}
 {% include 'script_footer.html' %}
+{% include 'js.html' %}
   </body>
 </html>