diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
index d822e929d..2c523ddd7 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/DateTimePicker.java
@@ -218,6 +218,10 @@ public class DateTimePicker extends UIBean {
             addParameter("displayWeeks", findString(displayWeeks));
         if(adjustWeeks != null)
             addParameter("adjustWeeks", findValue(adjustWeeks, Boolean.class));
+
+        if(disabled != null)
+            addParameter("disabled", findValue(disabled, Boolean.class));
+
         if(startDate != null)
             addParameter("startDate", format(findValue(startDate)));
         if(endDate != null)
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
index 0616a68fd..45fc2ad08 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTag.java
@@ -78,6 +78,7 @@ public class DateTimePickerTag extends AbstractUITag {
         dateTimePicker.setType(type);
         dateTimePicker.setTemplateCssPath(templateCssPath);
         dateTimePicker.setValueNotifyTopics(valueNotifyTopics);
+        dateTimePicker.setDisabled(disabled);
     }
 
     public void setAdjustWeeks(String adjustWeeks) {
diff --git a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl b/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
index 66eb62034..c8bdfae3a 100644
--- a/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/datetimepicker.ftl
@@ -91,6 +91,9 @@
   <#if parameters.valueNotifyTopics?if_exists != "">
 	valueNotifyTopics="${parameters.valueNotifyTopics?html}"<#rt/>
   </#if>
+  <#if parameters.disabled?exists>
+    disabled="${parameters.disabled?string?html}"<#rt/>
+  </#if>
   saveFormat="rfc"<#rt/>
   <#include "/${parameters.templateDir}/simple/scripting-events.ftl" />
 ></div>
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
index 1cec8cc4b..6b9361e46 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AbstractUITagTest.java
@@ -154,9 +154,6 @@ public abstract class AbstractUITagTest extends AbstractTagTest {
      * #verifyGenericProperties(org.apache.struts2.views.jsp.ui.AbstractUITag, String, String[])} as properties to
      * verify.<p/> This implementation defines testdata for all common AbstractUITag properties and may be overridden in
      * subclasses.
-     *
-     * @return A Map of PropertyHolders values bound to {@link org.apache.struts2.views.jsp.ui.AbstractUITagTest.PropertyHolder#getName()}
-     *         as key.
      */
     protected Map initializedGenericTagTestProperties() {
         Map result = new HashMap();
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
index 407108107..80d2b9946 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest.java
@@ -58,6 +58,32 @@ public class DateTimePickerTagTest extends AbstractUITagTest {
             .getResource("DateTimePickerTagTest-1.txt"));
     }
 
+    public void testSimpleDisabled() throws Exception {
+        DateTimePickerTag tag = new DateTimePickerTag();
+        tag.setPageContext(pageContext);
+
+        tag.setId("id");
+
+        tag.setAdjustWeeks("true");
+        tag.setDayWidth("b");
+        tag.setDisplayWeeks("true");
+        tag.setEndDate("%{'2008-01-01'}");
+        tag.setStartDate("%{'2008-02-02'}");
+        tag.setStaticDisplay("false");
+        tag.setWeekStartsOn("g");
+        tag.setName("h");
+        tag.setLanguage("i");
+        tag.setTemplateCssPath("j");
+        tag.setValueNotifyTopics("k");
+        tag.setValue("%{'2008-03-03'}");
+        tag.setDisabled("true");
+        tag.doStartTag();
+        tag.doEndTag();
+
+        verify(DateTimePickerTagTest.class
+            .getResource("DateTimePickerTagTest-2.txt"));
+    }
+
     public void testTodayValue() throws Exception {
         DateTimePickerTag tag = new DateTimePickerTag();
         tag.setPageContext(pageContext);
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
new file mode 100644
index 000000000..14688001e
--- /dev/null
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/DateTimePickerTagTest-2.txt
@@ -0,0 +1,19 @@
+<div dojoType="struts:StrutsDatePicker" 
+     id="id"
+     value="2008-03-03"
+     lang="i"
+     name="h"
+     inputName="dojo.h"
+     displayWeeks="true"
+     adjustWeeks="true"
+     startDate="2008-02-02"
+     endDate="2008-01-01"
+     weekStartsOn="g"
+     staticDisplay="false"
+     templateCssPath="j"
+     valueNotifyTopics="k"
+     disabled="true"
+     saveFormat="rfc">
+</div>
+<script language="JavaScript" type="text/javascript">djConfig.searchIds.push("id");</script>
+