diff --git a/ChangeLog b/ChangeLog
index ea8c4b39b6a..e7e9a17f089 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,7 @@ English Dolibarr ChangeLog
 ***** ChangeLog for 3.5 compared to 3.4 *****
 For users:
 - New: [ task #877 ] Reorganize menus
-
+- New: [ task #858 ] Holiday module: note on manual holiday assignation
 
 
 ***** ChangeLog for 3.4 compared to 3.3.2 *****
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 36e93d84271..ce9e6d4854f 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -67,7 +67,10 @@ if ($action == 'update' && isset($_POST['update_cp']))
     }
 
     // On ajoute la modification dans le LOG
-    $holiday->addLogCP($user->id,$userID, $langs->trans('Event').': '.$langs->trans('ManualUpdate'),$userValue);
+    //If the user set a comment, we add it to the log comment
+    $comment = (isset($_POST['note_holiday'][$userID]) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+
+    $holiday->addLogCP($user->id,$userID, $langs->trans('Event').': '.$langs->trans('ManualUpdate').$comment,$userValue);
 
     // Mise à jour des congés de l'utilisateur
     $holiday->updateSoldeCP($userID,$userValue);
@@ -145,8 +148,9 @@ print '<input type="hidden" name="action" value="update" />';
 print '<table class="noborder" width="100%;">';
 print "<tr class=\"liste_titre\">";
 print '<td width="5%">'.$langs->trans('ID').'</td>';
-print '<td width="60%">'.$langs->trans('UserName').'</td>';
+print '<td width="50%">'.$langs->trans('UserName').'</td>';
 print '<td width="20%" style="text-align:center">'.$langs->trans('Available').'</td>';
+print '<td width="20%" style="text-align:center">'.$langs->trans('Note').'</td>';
 print '<td>'.$langs->trans('UpdateButtonCP').'</td>';
 print '</tr>';
 
@@ -166,6 +170,7 @@ foreach($listUsers as $users)
     print '<td style="text-align:center">';
     print '<input type="text" value="'.$holiday->getCPforUser($users['rowid']).'" name="nb_holiday['.$users['rowid'].']" size="5" style="text-align: center;"/>';
     print ' '.$langs->trans('days').'</td>'."\n";
+    print '<td style="text-align:center"><input type="text" value="" name="note_holiday['.$users['rowid'].']" size="30"/></td>';
     print '<td><input type="submit" name="update_cp['.$users['rowid'].']" value="'.dol_escape_htmltag($langs->trans("Update")).'" class="button"/></td>'."\n";
     print '</tr>';