diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StartConstraintType.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StartConstraintType.java
index 60c1d6108..b287992f9 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StartConstraintType.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StartConstraintType.java
@@ -41,6 +41,18 @@ public enum StartConstraintType {
         public StartConstraintType newTypeAfterMoved() {
             return START_NOT_EARLIER_THAN;
         }
+    },
+    AS_LATE_AS_POSSIBLE(false) {
+        @Override
+        public StartConstraintType newTypeAfterMoved() {
+            return FINISH_NOT_LATER_THAN;
+        }
+    },
+    FINISH_NOT_LATER_THAN(true) {
+        @Override
+        public StartConstraintType newTypeAfterMoved() {
+            return FINISH_NOT_LATER_THAN;
+        }
     };
 
     private boolean dateRequired;
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 266be3f75..f392a106c 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
@@ -134,6 +134,10 @@ public class TaskElementAdapter implements ITaskElementAdapter {
                 return Collections
                         .singletonList(biggerOrEqualThan(toGantt(startConstraint
                                 .getConstraintDate())));
+            case AS_LATE_AS_POSSIBLE:
+                return Collections.emptyList();
+            case FINISH_NOT_LATER_THAN:
+                return Collections.emptyList();
             default:
                 throw new RuntimeException("can't handle " + constraintType);
             }
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java
index 7fb034446..c14cd6384 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/taskedition/TaskPropertiesController.java
@@ -103,6 +103,28 @@ public class TaskPropertiesController extends GenericForwardComposer {
             public String getName() {
                 return _("START_IN_FIXED_DATE");
             }
+        },
+        FINISH_NOT_LATER_THAN(StartConstraintType.FINISH_NOT_LATER_THAN) {
+            @Override
+            public String getDescription() {
+                return _("finish not later than");
+            }
+
+            @Override
+            public String getName() {
+                return _("FINISH_NOT_LATER_THAN");
+            }
+        },
+        AS_LATE_AS_POSSIBLE(StartConstraintType.AS_LATE_AS_POSSIBLE) {
+            @Override
+            public String getDescription() {
+                return _("as late as possible");
+            }
+
+            @Override
+            public String getName() {
+                return _("AS_LATE_AS_POSSIBLE");
+            }
         };
 
         public static void appendItems(Combobox combo) {