diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
index e9a70c503..397fe6fcb 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
@@ -45,6 +45,8 @@ public abstract class TaskElement extends BaseEntity {
 
     private Date endDate;
 
+    private LocalDate deadline;
+
     private String name;
 
     private String notes;
@@ -171,6 +173,14 @@ public abstract class TaskElement extends BaseEntity {
         this.endDate = endDate != null ? new Date(endDate.getTime()) : null;
     }
 
+    public LocalDate getDeadline() {
+        return deadline;
+    }
+
+    public void setDeadline(LocalDate deadline) {
+        this.deadline = deadline;
+    }
+
     void add(Dependency dependency) {
         if (this.equals(dependency.getOrigin())) {
             dependenciesWithThisOrigin.add(dependency);
diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
index 9b1d77788..2e0358d29 100644
--- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
+++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/Tasks.hbm.xml
@@ -14,6 +14,7 @@
         <property name="notes"/>
         <property name="startDate" type="timestamp" />
         <property name="endDate" type="timestamp" />
+        <property name="deadline" type="org.joda.time.contrib.hibernate.PersistentLocalDate" />
 
         <many-to-one name="orderElement" cascade="none" column="ORDER_ELEMENT_ID" not-null="false" />