diff --git a/www/static/.htaccess b/www/static/.htaccess
index af19139ab9..b1ef261fd6 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -20,7 +20,7 @@ redirect 301 /api/openstack-compute/1.1/ /api/openstack-compute/2/
 redirect 301 /trunk/openstack-compute/admin/content/adding-images.html /cli-reference/content/chapter_cli-glance-property.html
 
 # Redirect config reference precisely
-redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /kilo/config-reference/content/list-of-compute-config-options.html
+redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /liberty/config-reference/content/list-of-compute-config-options.html
 
 redirect 301 /trunk/openstack-compute/starter/ /trunk/
 
@@ -32,8 +32,8 @@ redirect 301 /incubation/openstack-network/developer/quantum-api-1.0/content/ /a
 redirect 301 /trunk/openstack-compute/install/content /trunk/openstack-compute/install/yum/content
 
 # Redirecting trunk basic install to install guide
-redirect 301 /trunk/basic-install/apt/content /kilo/install-guide/apt/content/
-redirect 301 /trunk/basic-install/yum/content /kilo/install-guide/yum/content/
+redirect 301 /trunk/basic-install/apt/content /liberty/install-guide-ubuntu/
+redirect 301 /trunk/basic-install/yum/content /liberty/install-guide-rdo/
 
 # Redirecting trunk admin guides to admin-guide-cloud
 redirect 301 /trunk/openstack-block-storage/admin/content/ /admin-guide-cloud/
@@ -68,8 +68,8 @@ redirect 301 /incubation/ /
 redirectmatch /identity/api/.*$ http://developer.openstack.org/
 
 # Redirect old Networking Admin Guide to Configuration Reference
-redirect 301 /trunk/openstack-network/admin/content/under_the_hood_openvswitch.html /kilo/config-reference/content/networking-plugin-openvswitch_agent.html
-redirect 301 /trunk/openstack-network/admin/content/under_the_hood_linuxbridge.html /kilo/config-reference/content/networking-plugin-linuxbridge_agent.html
+redirect 301 /trunk/openstack-network/admin/content/under_the_hood_openvswitch.html /liberty/config-reference/content/networking-plugin-openvswitch_agent.html
+redirect 301 /trunk/openstack-network/admin/content/under_the_hood_linuxbridge.html /liberty/config-reference/content/networking-plugin-linuxbridge_agent.html
 redirectmatch /trunk/openstack-network/admin/content/.*$ /admin-guide-cloud/index.html
 redirectmatch /network-admin/admin/content/.*$ /admin-guide-cloud/index.html
 
@@ -114,8 +114,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 kilo/config-reference
-redirectmatch 301 /trunk/config-reference/content/(.*) /kilo/config-reference/content/$1
+# Redirect trunk/config-reference to liberty/config-reference
+redirectmatch 301 /trunk/config-reference/content/(.*) /liberty/config-reference/content/$1
 
 # Redirect apt-debian install guide for Icehouse
 redirectmatch 301 /icehouse/install-guide/install/apt-debian/.*$ /