diff --git a/www/juno/index.html b/www/juno/index.html
deleted file mode 100644
index 4f89c09b41..0000000000
--- a/www/juno/index.html
+++ /dev/null
@@ -1,100 +0,0 @@
-{% set scriptdir = '../common/js/' %}
-{% set cssdir = '../common/css/' %}
-{% extends "templates/base.tmpl" %}
-{% block pagetitle %}Juno{% endblock %}
-{% block title %}{% endblock %}
-{% block header %}
-{% endblock header %}
-{% block content %}
-    <!-- Begin Page Content -->
-    <div class="top-docs-wrapper">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-8 col-md-8 col-sm-8">
-                <h1>Welcome to OpenStack Documentation</h1>
-                <p>
-                    <strong>What is OpenStack?</strong> OpenStack is a cloud operating system that controls large pools of compute, storage, and networking resources throughout a datacenter, all managed through a dashboard that gives administrators control while empowering their users to provision resources through a web interface.
-                </p>
-                <hr>
-                <h3>What are the next steps?</h3>
-                <a href="#docs-main-body" class="overview-btn docs-btn">View The Docs <i class="fa fa-arrow-circle-o-down"></i></a>
-                <a href="http://www.openstack.org/software/start/" class="overview-btn docs-btn">Get OpenStack <i class="fa fa-arrow-circle-o-right"></i></a>
-                <a href="http://www.openstack.org/marketplace/training" class="overview-btn docs-btn">Get Training <i class="fa fa-arrow-circle-o-right"></i></a>
-                <form class="docs-main-search-form">
-      <script type="text/javascript">
-        (function() {
-        var cx = '000108871792296872333:noj9nikm74i';
-        var gcse = document.createElement('script');
-        gcse.type = 'text/javascript';
-        gcse.async = true;
-        gcse.src = (document.location.protocol == 'https:' ? 'https:' :
-'http:') +
-            '//www.google.com/cse/cse.js?cx=' + cx;
-        var s = document.getElementsByTagName('script')[0];
-        s.parentNode.insertBefore(gcse, s);
-      })();
-       </script>
-       <gcse:search gname="standard" as_sitesearch="docs.openstack.org">
-       </gcse:search>
-       </form>
-       </div>
-        <div class="col-lg-4 col-md-4 col-sm-4 superuser-wrapper">
-            <div id="superuser-img"></div>
-        </div>
-    </div>
-</div>
-</div>
-<div class="mid-docs-wrapper" id="docs-main-body">
-    <div class="container">
-        <div class="row">
-            <div class="col-lg-9 col-md-9 col-sm-9">
-                <h2>Documentation for Juno (October 2014)</h2>
-                <p>This is an earlier OpenStack release. Use the menu to select a later release, if needed.</p>
-            </div>
-            {% include 'templates/dropdown_releases_and_languages.tmpl' %}
-        </div>
-    </div>
-</div>
-        <div class="container">
-            <div class="row">
-                <div class="col-lg-12">
-                </div>
-            </div>
-            <div class="row docs-toc">
-                <div class="col-lg-6 col-md-6 col-sm-6">
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-cogs"></i> Install Guides</h3>
-                        <p>Getting started with the most commonly used OpenStack services</p>
-                        <a href="/juno/install-guide/install/zypper/content/">Installation Guide for openSUSE 13.1 and SUSE Linux Enterprise Server 11</a>
-                        <a href="/juno/install-guide/install/yum/content/">Installation Guide for Red Hat Enterprise Linux 7, CentOS 7, and Fedora 20</a>
-                        <a href="/juno/install-guide/install/apt/content/">Installation Guide for Ubuntu 14.04 (LTS)</a>
-                    </div>
-                    <div class="docs-link-sections">
-                        {% include 'templates/ops_and_admin_guides.tmpl' %}
-                        <a href="/kilo/networking-guide/">Networking Guide</a>
-                        <p>Deploy and manage OpenStack Networking (neutron)</p>
-                    </div>
-                    <div class="docs-link-sections">
-                        <h3><i class="fa fa-wrench"></i> Configuration Guides</h3>
-                        <a href="/juno/config-reference/content/">Configuration Reference</a>
-                        <p>Installation and configuration options for OpenStack</p>
-                    </div>
-                    {% include 'templates/api_guides.tmpl' %}
-                </div>
-                <div class="col-lg-6 col-md-6 col-sm-6">
-                    {% include 'templates/user_guides.tmpl' %}
-                    {% include 'templates/project_guides.tmpl' %}
-                    {% include 'templates/contributor_guides.tmpl' %}
-                    {% include 'templates/training_guides.tmpl' %}
-                </div>
-            </div>
-            <div class="row docs-contribute-wrapper">
-                <div class="col-lg-12">
-                    <p>Documentation treated like code, powered by the community - interested?</p>
-                    <a href="http://docs.openstack.org/contributor-guide/index.html" class="overview-btn contribute-btn">How To Contribute <i class="fa fa-chevron-right"></i></a>
-                </div>
-            </div>
-        </div>
-</div>
-    <!-- End Page Content -->
-{% endblock content %}
diff --git a/www/static/.htaccess b/www/static/.htaccess
index 1a66317f06..0104595602 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -6,6 +6,8 @@ redirectmatch 301 /essex/.*$ /index.html
 redirectmatch 301 /folsom/.*$ /index.html
 redirectmatch 301 /grizzly/.*$ /index.html
 redirectmatch 301 /havana/.*$ /index.html
+redirectmatch 301 /icehouse/.*$ /index.html
+redirectmatch 301 /juno/.*$ /index.html
 
 # Redirect for the original version of compute
 redirect 301 /openstack-compute/ /