diff --git a/.htaccess b/.htaccess
index bad10f3a6c..8d1f1adfac 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1,12 @@
-RedirectMatch ^/favicon.ico /assets/images/favicon.ico
\ No newline at end of file
+RedirectMatch ^/favicon.ico /assets/images/favicon.ico
+RedirectMatch ^/shiro-all(.*) /static/current/shiro-all/$1
+RedirectMatch ^/shiro-core(.*) /static/current/shiro-core/$1
+
+RedirectMatch ^/shiro-quartz(.*) /static/current/shiro-quartz/$1
+RedirectMatch ^/shiro-samples(.*) /static/current/shiro-samples/$1
+RedirectMatch ^/shiro-ehcache(.*) /static/current/shiro-ehcache/$1
+RedirectMatch ^/shiro-cas(.*) /static/current/shiro-cas/$1
+RedirectMatch ^/shiro-aspectj(.*) /static/current/shiro-aspectj/$1
+RedirectMatch ^/shiro-spring(.*) /static/current/shiro-spring/$1
+RedirectMatch ^/shiro-guice(.*) /static/current/shiro-guice/$1
+RedirectMatch ^/shiro-web(.*) /static/current/shiro-web/$1
diff --git a/index.html b/index.html
index f7f4adee64..2f79a896a9 100644
--- a/index.html
+++ b/index.html
@@ -82,7 +82,7 @@ <h1>Getting Started</h1>
             <div class="col-md-6 col-sm-6 col-padded-top col-center">
                 <div style="width: 100%; max-width: 272px; display: inline-block; text-align: center; margin-left: 50px; padding-bottom: 15px;">
                     <iframe frameborder="0" scrolling="auto" width="310" height="233"
-                            src="http://www.youtube.com/embed/YJByiDvOhsc?rel=0" allowfullscreen="true"></iframe>
+                            src="https://www.youtube.com/embed/YJByiDvOhsc?rel=0" allowfullscreen="true"></iframe>
                 </div>
             </div>
         </div>
diff --git a/shiro-web/index.html.vtl b/shiro-web/index.html.vtl
new file mode 100644
index 0000000000..472f409072
--- /dev/null
+++ b/shiro-web/index.html.vtl
@@ -0,0 +1 @@
+#redirect("https://shiro.apache.org/static/current/shiro-web/index.html" ,"Shiro-Web")
diff --git a/site.xml b/site.xml
new file mode 100644
index 0000000000..02d41efa05
--- /dev/null
+++ b/site.xml
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+  xmlns:image="http://www.google.com/schemas/sitemap-image/1.1">
+
+  <url>
+    <loc>https://shiro.apache.org/index.html</loc>
+    <priority>1</priority>
+    <image:image>
+     <image:loc>https://shiro.apache.org/assets/images/apache-shiro-logo.png</image:loc>
+   </image:image>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/permissions.html</loc>
+    <priority>0.8</priority>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/webapp-tutorial.html</loc>
+    <priority>0.8</priority>
+  </url>
+  
+  <url>
+    <loc>https://shiro.apache.org/10-minute-tutorial.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/about.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/adoption.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/architecture.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/articles.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/authentication-features.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/authentication.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/authorization-features.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/authorization.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/cachemanager.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/caching.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/cas.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/command-line-hasher.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/commercial-support.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/community.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/concurrency.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/conferences.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/configuration.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/contribute.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/core.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/cryptography-features.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/cryptography.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/developer-resources.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/developers.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/documentation-help-block.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/documentation.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/download.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/events.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/features-overview.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/features.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/forums.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/get-started.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/getting-started-block.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/graduation-resolution.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/guice.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/guides.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/how-to-contribute.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/inclusionslibrary.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/integration.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/introduction.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/issues.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/java-annotations-list.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/java-annotations.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/java-authentication-guide.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/java-authorization-guide.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/java-cryptography-guide.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/jsp-tag-library.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/license.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/mailing-lists.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/navigation.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/news.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/overview.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/powered-by-shiro.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/privacy-policy.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/realm.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/reference.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/securitymanager.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/session-management-features.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/session-management.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/site.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/siteheader.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/spring.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/subject.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/support.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/team.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/terminology.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/testing.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/tools.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/tutorial.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/version-2-brainstorming.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/web-features.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/web.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/what-is-shiro.html</loc>
+  </url>
+  <url>
+    <loc>https://shiro.apache.org/wiki-todos.html</loc>
+  </url>
+</urlset>
\ No newline at end of file