diff --git a/www/static/.htaccess b/www/static/.htaccess
index f4ac74676..a418f671a 100644
--- a/www/static/.htaccess
+++ b/www/static/.htaccess
@@ -41,9 +41,11 @@ redirect 301 /api-ref-objectstorage-v1.html /api-ref/object-storage/index.html
 # Redirect Orchestration API
 redirect 301 /api-ref-orchestration-v1.html /api-ref/orchestration/index.html
 # Redirect Shared File Systems API v2
-redirect 301 /api-ref-share-v2.html /api-ref/shared-file-systems/index.html
+redirect 301 /api-ref-share-v2.html /api-ref/shared-file-system/index.html
 # Redirect Shared File Systems API v1
-redirect 301 /api-ref-share-v1.html /api-ref/shared-file-systems/index.html
+redirect 301 /api-ref-share-v1.html /api-ref/shared-file-system/index.html
+# Redirect "shared-file-systems" (plural) links to official "shared-file-system" (singular)
+redirectmatch 301 /api-ref/shared-file-systems/(.*) /api-ref/shared-file-system/$1
 # Redirect Telemetry (ceilometer only) API
 redirect 301 /api-ref-telemetry-v2.html http://docs.openstack.org/developer/ceilometer/webapi/v2.html
 # Redirect senlin old service-type resource-cluster to clustering
diff --git a/www/static/sitemap.xml b/www/static/sitemap.xml
index fa738a97c..76a97029f 100644
--- a/www/static/sitemap.xml
+++ b/www/static/sitemap.xml
@@ -169,7 +169,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://developer.openstack.org/api-ref/shared-file-systems/</loc>
+    <loc>https://developer.openstack.org/api-ref/shared-file-system/</loc>
     <lastmod>2017-02-22T17:05:58+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>
@@ -505,7 +505,7 @@
   </url>
   <url>
     <priority>1.0</priority>
-    <loc>https://developer.openstack.org/api-ref/shared-file-systems/index.html</loc>
+    <loc>https://developer.openstack.org/api-ref/shared-file-system/index.html</loc>
     <lastmod>2017-02-22T17:05:58+0000</lastmod>
     <changefreq>daily</changefreq>
   </url>