diff --git a/core/src/main/java/org/apache/struts2/components/TextArea.java b/core/src/main/java/org/apache/struts2/components/TextArea.java
index 6e280fcc0..4c903b51e 100644
--- a/core/src/main/java/org/apache/struts2/components/TextArea.java
+++ b/core/src/main/java/org/apache/struts2/components/TextArea.java
@@ -51,6 +51,7 @@ public class TextArea extends UIBean {
     protected String readonly;
     protected String rows;
     protected String wrap;
+    protected String maxlength;
 
     public TextArea(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
         super(stack, request, response);
@@ -78,6 +79,10 @@ public class TextArea extends UIBean {
         if (wrap != null) {
             addParameter("wrap", findString(wrap));
         }
+
+        if (maxlength != null) {
+            addParameter("maxlength", findString(maxlength));
+        }
     }
 
     @StrutsTagAttribute(description="HTML cols attribute", type="Integer")
@@ -99,4 +104,9 @@ public class TextArea extends UIBean {
     public void setWrap(String wrap) {
         this.wrap = wrap;
     }
+
+    @StrutsTagAttribute(description="HTML maxlength attribute", type="Integer")
+    public void setMaxlength(String maxlength) {
+        this.maxlength = maxlength;
+    }
 }
diff --git a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
index 1f77f1def..0ba144227 100644
--- a/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
+++ b/core/src/main/java/org/apache/struts2/views/jsp/ui/TextareaTag.java
@@ -37,6 +37,7 @@ public class TextareaTag extends AbstractUITag {
     protected String readonly;
     protected String rows;
     protected String wrap;
+    protected String maxlength;
 
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new TextArea(stack, req, res);
@@ -50,6 +51,7 @@ public class TextareaTag extends AbstractUITag {
         textArea.setReadonly(readonly);
         textArea.setRows(rows);
         textArea.setWrap(wrap);
+        textArea.setMaxlength(maxlength);
     }
 
     public void setCols(String cols) {
@@ -67,5 +69,9 @@ public class TextareaTag extends AbstractUITag {
     public void setWrap(String wrap) {
         this.wrap = wrap;
     }
+    
+    public void setMaxlength(String maxlength) {
+        this.maxlength = maxlength;
+    }    
 
 }
diff --git a/core/src/site/resources/tags/textarea-attributes.html b/core/src/site/resources/tags/textarea-attributes.html
index fbdf0549f..8a35ed8c1 100644
--- a/core/src/site/resources/tags/textarea-attributes.html
+++ b/core/src/site/resources/tags/textarea-attributes.html
@@ -133,6 +133,14 @@
             <td align="left" valign="top">String</td>
             <td align="left" valign="top">Define label position of form element (top/left)</td>
         </tr>
+        <tr>
+            <td align="left" valign="top">maxlength</td>
+            <td align="left" valign="top">false</td>
+            <td align="left" valign="top"></td>
+            <td align="left" valign="top">false</td>
+            <td align="left" valign="top">Integer</td>
+            <td align="left" valign="top">HTML maxlength attribute</td>
+        </tr>
         <tr>
             <td align="left" valign="top">name</td>
             <td align="left" valign="top">false</td>