diff --git a/www/static/.htaccess b/www/static/.htaccess
index 000aaa29f5..53cb937d06 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -11,6 +11,7 @@ redirectmatch 301 /havana/.*$ /index.html
 redirectmatch 301 /icehouse/(?!config-reference)/.*$ /index.html
 redirectmatch 301 /juno/(?!config-reference)/.*$ /index.html
 redirectmatch 301 /kilo/(?!config-reference)/.*$ /index.html
+redirectmatch 301 /liberty/(?!config-reference)/.*$ /index.html
 
 # Redirect for the original version of compute
 redirectmatch 301 /openstack-compute/.*$ /index.html
@@ -23,7 +24,7 @@ redirectmatch 301 /openstack-object-storage/.*$ /index.html
 redirect 301 /trunk/openstack-compute/admin/content/adding-images.html /cli-reference/glance-property-keys.html
 
 # Redirect config reference precisely
-redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /newton/config-reference/compute/nova-conf.html
+redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /ocata/config-reference/compute/nova-conf.html
 
 # Redirecting incubation quantum
 redirectmatch 301 /incubation/openstack-network/admin/content/ /admin-guide/networking.html
@@ -33,12 +34,15 @@ redirectmatch 301 /incubation/openstack-network/developer/quantum-api-1.0/conten
 redirectmatch 301 /trunk/openstack-compute/install/content/.*$ /index.html
 
 # Redirecting trunk basic install to install guide
-redirect 301 /trunk/basic-install/apt/content /newton/install-guide-ubuntu/
-redirect 301 /trunk/basic-install/yum/content /newton/install-guide-rdo/
+redirect 301 /trunk/basic-install/apt/content /ocata/install-guide-ubuntu/
+redirect 301 /trunk/basic-install/yum/content /ocata/install-guide-rdo/
 
 # redirect kilo install guide
 redirectmatch 301 /kilo/install-guide.*$ /index.html
 
+# redirect liberty install guide
+redirectmatch 301 /liberty/install-guide.*$ /index.html
+
 # Redirecting trunk admin guides to admin-guide
 redirect 301 /trunk/openstack-block-storage/admin/content/ /admin-guide/
 redirect 301 /trunk/openstack-compute/admin/content/ /admin-guide/
@@ -111,8 +115,8 @@ redirect 301 /api/openstack-image-service/2.0/content/appendix-b-http-patch-medi
 # Redirect /trunk/index.html to /index.html
 redirect 301 /trunk/index.html /index.html
 
-# Redirect trunk/config-reference to newton/config-reference
-redirectmatch 301 /trunk/config-reference/content/.*$ /newton/config-reference/index.html
+# Redirect trunk/config-reference to ocata/config-reference
+redirectmatch 301 /trunk/config-reference/content/.*$ /ocata/config-reference/index.html
 
 # Redirect trove install guide
 redirectmatch 301 "^/kilo/install-guide/install/.*/ch_trove.html$" /
@@ -443,7 +447,7 @@ redirect 301 /hot-guide/content/ /developer/heat/template_guide/
 redirect 301 /hot-reference/content/ /developer/heat/template_guide/
 
 # Redirect networking-guide since it is now versioned
-redirect 301 /networking-guide/ /newton/networking-guide/
+redirect 301 /networking-guide/ /ocata/networking-guide/
 
 # Redirect nova/devref/
 redirectmatch 301 ^/developer/nova/devref/(.+)$ /developer/nova/$1