diff --git a/ChangeLog b/ChangeLog
index dce93bb61..a8ca9b8a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,6 +68,7 @@ Bugs
    (thanks to Fidel Mato).
  + #1300 Encode/decode pairing is now properly balanced.
  + #1305 Commit hash now available in tarball builds (thanks to Ben Boeckel).
+ + #1387 ZSH Auto-Completion dates are not current (thanks to Benjamin Weber).
  + Fixed bug so that 'limit:page' now considers footnote messages.
  + Fixed bug where specifying an ID of 0 yielded all completed/deleted tasks
    (thanks to greenskeleton).
diff --git a/scripts/zsh/_task b/scripts/zsh/_task
index 2668449fe..10aba19ff 100644
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@@ -98,11 +98,13 @@ _regex_words values 'task dates' \
 	'soww:Start of work week' \
 	'socw:Start of calendar week' \
 	'som:Start of month' \
+	'soq:Start of quarter' \
 	'soy:Start of year' \
 	'eow:End of week' \
 	'eoww:End of work week' \
 	'eocw:End of calendar week' \
 	'eom:End of month' \
+	'eoq:End of quarter' \
 	'eoy:End of year' \
 	'mon:Monday' \
 	'tue:Tuesday'\
@@ -110,7 +112,16 @@ _regex_words values 'task dates' \
 	'thu:Thursday' \
 	'fri:Friday' \
 	'sat:Saturday' \
-	'sun:Sunday'
+	'sun:Sunday' \
+  'good*friday:Good Friday' \
+  'easter:Easter' \
+  'eastermonday:Easter Monday' \
+  'ascension:Ascension' \
+  'pentecost:Pentecost' \
+  'midsommar:Midsommar' \
+  'midsommarafton:Midsommarafton' \
+  'later:Later' \
+  'someday:Some Day'
 _task_dates=("$reply[@]")
 
 local -a _task_reldates
@@ -141,7 +152,7 @@ _regex_words values 'task frequencies' \
 	'weekly:Every week' \
 	'biweekly:Every two weeks' \
 	'fortnight:Every two weeks' \
-   'monthly:Every month' \
+  'monthly:Every month' \
 	'quarterly:Every three months' \
 	'semiannual:Every six months' \
 	'annual:Every year' \