diff --git a/mozilla/layout/generic/nsImageMap.cpp b/mozilla/layout/generic/nsImageMap.cpp
index dd449c6d1b9..47022b3182d 100644
--- a/mozilla/layout/generic/nsImageMap.cpp
+++ b/mozilla/layout/generic/nsImageMap.cpp
@@ -834,12 +834,17 @@ nsImageMap::AddArea(nsIContent* aArea)
   PRBool suppress = PR_FALSE;/* XXX */
 
   Area* area;
-  if ((0 == shape.Length()) || shape.EqualsIgnoreCase("rect")) {
+  if ((0 == shape.Length()) ||
+      shape.EqualsIgnoreCase("rect") ||
+      shape.EqualsIgnoreCase("rectangle")) {
     area = new RectArea(baseURL, href, target, altText, suppress, hasURL);
-  } else if (shape.EqualsIgnoreCase("poly") ||
-             shape.EqualsIgnoreCase("polygon")) {
+  }
+  else if (shape.EqualsIgnoreCase("poly") ||
+           shape.EqualsIgnoreCase("polygon")) {
     area = new PolyArea(baseURL, href, target, altText, suppress, hasURL);
-  } else if (shape.EqualsIgnoreCase("circle")) {
+  }
+  else if (shape.EqualsIgnoreCase("circle") ||
+           shape.EqualsIgnoreCase("circ")) {
     area = new CircleArea(baseURL, href, target, altText, suppress, hasURL);
   }
   else {
diff --git a/mozilla/layout/html/base/src/nsImageMap.cpp b/mozilla/layout/html/base/src/nsImageMap.cpp
index dd449c6d1b9..47022b3182d 100644
--- a/mozilla/layout/html/base/src/nsImageMap.cpp
+++ b/mozilla/layout/html/base/src/nsImageMap.cpp
@@ -834,12 +834,17 @@ nsImageMap::AddArea(nsIContent* aArea)
   PRBool suppress = PR_FALSE;/* XXX */
 
   Area* area;
-  if ((0 == shape.Length()) || shape.EqualsIgnoreCase("rect")) {
+  if ((0 == shape.Length()) ||
+      shape.EqualsIgnoreCase("rect") ||
+      shape.EqualsIgnoreCase("rectangle")) {
     area = new RectArea(baseURL, href, target, altText, suppress, hasURL);
-  } else if (shape.EqualsIgnoreCase("poly") ||
-             shape.EqualsIgnoreCase("polygon")) {
+  }
+  else if (shape.EqualsIgnoreCase("poly") ||
+           shape.EqualsIgnoreCase("polygon")) {
     area = new PolyArea(baseURL, href, target, altText, suppress, hasURL);
-  } else if (shape.EqualsIgnoreCase("circle")) {
+  }
+  else if (shape.EqualsIgnoreCase("circle") ||
+           shape.EqualsIgnoreCase("circ")) {
     area = new CircleArea(baseURL, href, target, altText, suppress, hasURL);
   }
   else {