diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java
index b8dd9ba00..e14ad0075 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/DefaultFundamentalProperties.java
@@ -142,4 +142,9 @@ public class DefaultFundamentalProperties implements ITaskFundamentalProperties
         setBeginDate(date);
     }
 
+    @Override
+    public Date getDeadline() {
+        return null;
+    }
+
 }
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java
index 908601af2..a22d0d45d 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/ITaskFundamentalProperties.java
@@ -44,6 +44,12 @@ public interface ITaskFundamentalProperties {
 
     public Date getBeginDate();
 
+    /**
+     * The deadline associated to the task. It can return null if has no
+     * deadline associated
+     */
+    public Date getDeadline();
+
     public void setLengthMilliseconds(long lengthMilliseconds);
 
     public long getLengthMilliseconds();
diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java
index a7e563672..eca74e290 100644
--- a/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java
+++ b/ganttzk/src/main/java/org/zkoss/ganttz/data/Task.java
@@ -224,4 +224,9 @@ public abstract class Task implements ITaskFundamentalProperties {
         fireChangesForPreviousValues(previousStart, previousLength);
     }
 
+    @Override
+    public Date getDeadline() {
+        return fundamentalProperties.getDeadline();
+    }
+
 }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
index a0e8e0e88..01879244e 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java
@@ -351,6 +351,15 @@ public class TaskElementAdapter implements ITaskElementAdapter {
                 task.explicityMoved(date);
             }
         }
+
+        @Override
+        public Date getDeadline() {
+            LocalDate deadline = taskElement.getDeadline();
+            if (deadline == null) {
+                return null;
+            }
+            return deadline.toDateTimeAtStartOfDay().toDate();
+        }
     }
 
     @Override