diff --git a/ChangeLog b/ChangeLog
index b1978d84c..915b83d6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ New features:
 * Add config parameter to disable/enable RememberMe authentication
 * Add start/end date for projects
 * Add new automated action to change task color based on the task link
+* Add milestone marker in board task
 * Add Portuguese (European) translation
 * Add Norwegian translation
 
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index b98e3bd57..152747076 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -93,6 +93,7 @@ class TaskFinder extends Base
                 '(SELECT count(*) FROM '.Subtask::TABLE.' WHERE '.Subtask::TABLE.'.task_id=tasks.id) AS nb_subtasks',
                 '(SELECT count(*) FROM '.Subtask::TABLE.' WHERE '.Subtask::TABLE.'.task_id=tasks.id AND status=2) AS nb_completed_subtasks',
                 '(SELECT count(*) FROM '.TaskLink::TABLE.' WHERE '.TaskLink::TABLE.'.task_id = tasks.id) AS nb_links',
+                '(SELECT 1 FROM '.TaskLink::TABLE.' WHERE '.TaskLink::TABLE.'.task_id = tasks.id AND '.TaskLink::TABLE.'.link_id = 9) AS is_milestone',
                 'tasks.id',
                 'tasks.reference',
                 'tasks.title',
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index cadcb2d61..2944db067 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -63,4 +63,10 @@
     <?php if (! empty($task['time_estimated'])): ?>
         <span class="task-time-estimated" title="<?= t('Time estimated') ?>"><?= $this->e($task['time_estimated']).'h' ?></span>
     <?php endif ?>
+
+    <?php if ($task['is_milestone'] == 1): ?>
+        <span title="<?= t('Milestone') ?>">
+            <i class="fa fa-flag"></i>
+        </span>
+    <?php endif ?>
 </div>