diff --git a/www/static/.htaccess b/www/static/.htaccess
index 1a54136579..7128108e7d 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -122,15 +122,15 @@ redirect 301 /developer/ironic/install/ironic-install.html /developer/ironic/dep
 redirect 301 /developer/ironic/dev/api-spec-v1.html /developer/ironic/webapi/v1.html
 
 # Redirect API docs that have been put in openstack-attic
-redirect 301 /api/openstack-block-storage/1.0/content/ http://specs.openstack.org/openstack/cinder-specs/specs/api/v2/block_storage_v2_overview.html
-redirect 301 /api/openstack-block-storage/2.0/content/ http://specs.openstack.org/openstack/cinder-specs/specs/api/v2/block_storage_v2_overview.html
-redirect 301 /api/openstack-compute/2.0/content/ http://developer.openstack.org/api-ref-compute-v2.html
-# redirect 301 /api/openstack-databases/ not sure if published
-redirect 301 /api/openstack-identity-service/2.0/content/ http://specs.openstack.org/openstack/keystone-specs/api/v2.0/identity-api-v2.0.html
-redirect 301 /api/openstack-identity-service/3/content/ http://specs.openstack.org/openstack/keystone-specs/api/v3/identity-api-v3.html
-redirect 301 /api/openstack-image-service/1.0/content/ http://specs.openstack.org/openstack/glance-specs/specs/api/v1/image_service_v1_api.html
-redirect 301 /api/openstack-image-service/1.1/content/ http://specs.openstack.org/openstack/glance-specs/specs/api/v1/image_service_v1_api.html
-redirect 301 /api/openstack-image-service/2.0/content/ http://specs.openstack.org/openstack/glance-specs/specs/api/v2/image-api-v2.html
-redirect 301 /api/openstack-network/2.0/content/ http://specs.openstack.org/openstack/neutron-specs/specs/api/networking_api_overview.html
-redirect 301 /api/openstack-object-storage/1.0/content/ http://docs.openstack.org/developer/swift/api/object_api_v1_overview.html
-redirect 301 /api/openstack-objectstorage/1.0/content/ http://docs.openstack.org/developer/swift/api/object_api_v1_overview.html
+redirectmatch 301 /api/openstack-block-storage/1.0/content/.*$ http://developer.openstack.org/api-ref-blockstorage-v1.html
+redirectmatch 301 /api/openstack-block-storage/2.0/content/.*$ http://developer.openstack.org/api-ref-blockstorage-v2.html
+redirectmatch 301 /api/openstack-compute/2/content/.*$ http://developer.openstack.org/api-ref-compute-v2.html
+redirectmatch 301 /api/openstack-databases/content/.*$ http://developer.openstack.org/api-ref-databases-v1.html
+redirectmatch 301 /api/openstack-identity-service/2.0/content/.*$ http://developer.openstack.org/api-ref-identity-v2.html
+redirectmatch 301 /api/openstack-identity-service/3/content/.*$ http://developer.openstack.org/api-ref-identity-v3.html
+redirectmatch 301 /api/openstack-image-service/1.0/content/.*$ http://developer.openstack.org/api-ref-image-v1.html
+redirectmatch 301 /api/openstack-image-service/1.1/content/.*$ http://developer.openstack.org/api-ref-image-v1.html
+redirectmatch 301 /api/openstack-image-service/2.0/content/.*$ http://developer.openstack.org/api-ref-image-v2.html
+redirectmatch 301 /api/openstack-network/2.0/content/.*$ http://developer.openstack.org/api-ref-networking-v2.html
+redirectmatch 301 /api/openstack-object-storage/1.0/content/.*$ http://developer.openstack.org/api-ref-objectstorage-v1.html
+redirectmatch 301 /api/openstack-objectstorage/1.0/content/.*$ http://developer.openstack.org/api-ref-objectstorage-v1.html