diff --git a/www/.htaccess b/www/.htaccess
index 65ecab7b03..8307ba2b65 100644
--- a/www/.htaccess
+++ b/www/.htaccess
@@ -14,7 +14,15 @@ redirect 301 /trunk/openstack-compute/admin/content/adding-images.html /image-gu
 redirect 301 /trunk/openstack-compute/admin/content/compute-options-reference.html /trunk/config-reference/content/list-of-compute-config-options.html
 
 # Redirect the Clients Guide to new End User Guide 
-redirect 301 /cli/quick-start/content/ /user-guide/content/ 
+redirect 301 /cli/quick-start/content/keystone_client.html /user-guide/content/keystone_commands.html
+redirect 301 /cli/quick-start/content/glance_client.html /user-guide/content/glance_commands.html
+redirect 301 /cli/quick-start/content/cinder_client.html /user-guide/content/cinder_commands.html
+redirect 301 /cli/quick-start/content/nova_client.html /user-guide/content/nova_commands.html
+redirect 301 /cli/quick-start/content/swift_client.html /user-guide/content/swift_commands.html
+redirect 301 /cli/quick-start/content/quantum_client.html /user-guide/content/neutron_commands.html
+redirect 301 /cli/quick-start/content/authenticate.html /user-guide/content/cli_openrc.html
+redirect 301 /cli/quick-start/content/prereq_software.html /user-guide/content/install_clients.html
+redirect 301 /cli/quick-start/content/ /user-guide/content/
 
 # Redirecting  folsom version
 redirectmatch 301 /folsom/.*$ /index.html