diff --git a/mozilla/content/html/style/src/nsCSSKeywordList.h b/mozilla/content/html/style/src/nsCSSKeywordList.h
index 1e5783f0678..f4ef9d9ce53 100644
--- a/mozilla/content/html/style/src/nsCSSKeywordList.h
+++ b/mozilla/content/html/style/src/nsCSSKeywordList.h
@@ -42,6 +42,7 @@
 CSS_KEY(_moz_bg_inset)
 CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
+CSS_KEY(_moz_default)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
 CSS_KEY(_moz_scrollbars_none)
diff --git a/mozilla/content/shared/public/nsCSSKeywordList.h b/mozilla/content/shared/public/nsCSSKeywordList.h
index 1e5783f0678..f4ef9d9ce53 100644
--- a/mozilla/content/shared/public/nsCSSKeywordList.h
+++ b/mozilla/content/shared/public/nsCSSKeywordList.h
@@ -42,6 +42,7 @@
 CSS_KEY(_moz_bg_inset)
 CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
+CSS_KEY(_moz_default)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
 CSS_KEY(_moz_scrollbars_none)
diff --git a/mozilla/content/shared/src/nsCSSProps.cpp b/mozilla/content/shared/src/nsCSSProps.cpp
index c529aa61733..ca3253e5b2d 100644
--- a/mozilla/content/shared/src/nsCSSProps.cpp
+++ b/mozilla/content/shared/src/nsCSSProps.cpp
@@ -611,6 +611,7 @@ const PRInt32 nsCSSProps::kTextAlignKTable[] = {
   eCSSKeyword_justify, NS_STYLE_TEXT_ALIGN_JUSTIFY,
   eCSSKeyword__moz_center, NS_STYLE_TEXT_ALIGN_MOZ_CENTER,
   eCSSKeyword__moz_right, NS_STYLE_TEXT_ALIGN_MOZ_RIGHT,
+  eCSSKeyword__moz_default, NS_STYLE_TEXT_ALIGN_DEFAULT,
   -1,-1
 };
 
diff --git a/mozilla/layout/html/document/src/html.css b/mozilla/layout/html/document/src/html.css
index fe7b1ea96fd..ada8d51341b 100644
--- a/mozilla/layout/html/document/src/html.css
+++ b/mozilla/layout/html/document/src/html.css
@@ -442,7 +442,7 @@ form {
 
 input {
   vertical-align: bottom;
-	text-align: left;
+  text-align: -moz-default;
   border: 2px inset rgb(204, 204, 204);
   color: black;
 	background-color: white;
@@ -1049,6 +1049,7 @@ td textarea {
 /* End - Margin setting for form controls inside tables for Nav Quirks */
 
 textarea {
+  text-align: -moz-default;
   box-sizing: border-box;
   font-family:-moz-fixed;
   vertical-align: bottom;
diff --git a/mozilla/layout/html/style/src/nsCSSKeywordList.h b/mozilla/layout/html/style/src/nsCSSKeywordList.h
index 1e5783f0678..f4ef9d9ce53 100644
--- a/mozilla/layout/html/style/src/nsCSSKeywordList.h
+++ b/mozilla/layout/html/style/src/nsCSSKeywordList.h
@@ -42,6 +42,7 @@
 CSS_KEY(_moz_bg_inset)
 CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
+CSS_KEY(_moz_default)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
 CSS_KEY(_moz_scrollbars_none)
diff --git a/mozilla/layout/html/style/src/nsCSSProps.cpp b/mozilla/layout/html/style/src/nsCSSProps.cpp
index c529aa61733..ca3253e5b2d 100644
--- a/mozilla/layout/html/style/src/nsCSSProps.cpp
+++ b/mozilla/layout/html/style/src/nsCSSProps.cpp
@@ -611,6 +611,7 @@ const PRInt32 nsCSSProps::kTextAlignKTable[] = {
   eCSSKeyword_justify, NS_STYLE_TEXT_ALIGN_JUSTIFY,
   eCSSKeyword__moz_center, NS_STYLE_TEXT_ALIGN_MOZ_CENTER,
   eCSSKeyword__moz_right, NS_STYLE_TEXT_ALIGN_MOZ_RIGHT,
+  eCSSKeyword__moz_default, NS_STYLE_TEXT_ALIGN_DEFAULT,
   -1,-1
 };
 
diff --git a/mozilla/layout/style/html.css b/mozilla/layout/style/html.css
index fe7b1ea96fd..ada8d51341b 100644
--- a/mozilla/layout/style/html.css
+++ b/mozilla/layout/style/html.css
@@ -442,7 +442,7 @@ form {
 
 input {
   vertical-align: bottom;
-	text-align: left;
+  text-align: -moz-default;
   border: 2px inset rgb(204, 204, 204);
   color: black;
 	background-color: white;
@@ -1049,6 +1049,7 @@ td textarea {
 /* End - Margin setting for form controls inside tables for Nav Quirks */
 
 textarea {
+  text-align: -moz-default;
   box-sizing: border-box;
   font-family:-moz-fixed;
   vertical-align: bottom;
diff --git a/mozilla/layout/style/nsCSSKeywordList.h b/mozilla/layout/style/nsCSSKeywordList.h
index 1e5783f0678..f4ef9d9ce53 100644
--- a/mozilla/layout/style/nsCSSKeywordList.h
+++ b/mozilla/layout/style/nsCSSKeywordList.h
@@ -42,6 +42,7 @@
 CSS_KEY(_moz_bg_inset)
 CSS_KEY(_moz_bg_outset)
 CSS_KEY(_moz_center)
+CSS_KEY(_moz_default)
 CSS_KEY(_moz_right)
 CSS_KEY(_moz_pre_wrap)
 CSS_KEY(_moz_scrollbars_none)
diff --git a/mozilla/layout/style/nsCSSProps.cpp b/mozilla/layout/style/nsCSSProps.cpp
index c529aa61733..ca3253e5b2d 100644
--- a/mozilla/layout/style/nsCSSProps.cpp
+++ b/mozilla/layout/style/nsCSSProps.cpp
@@ -611,6 +611,7 @@ const PRInt32 nsCSSProps::kTextAlignKTable[] = {
   eCSSKeyword_justify, NS_STYLE_TEXT_ALIGN_JUSTIFY,
   eCSSKeyword__moz_center, NS_STYLE_TEXT_ALIGN_MOZ_CENTER,
   eCSSKeyword__moz_right, NS_STYLE_TEXT_ALIGN_MOZ_RIGHT,
+  eCSSKeyword__moz_default, NS_STYLE_TEXT_ALIGN_DEFAULT,
   -1,-1
 };