diff --git a/AUTHORS b/AUTHORS
index 0c5e502c7..168fdea00 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -269,4 +269,5 @@ suggestions:
   Simon W. Jackson
   Sebastien Badia
   Michale Meier
-   Svetoslav Trochev
+  Svetoslav Trochev
+  Marc Cornellà
diff --git a/ChangeLog b/ChangeLog
index 7184046c0..93ae33212 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 - TW-148  default.command options (thanks to David Patrick).
 - TW-158  JSON export should model dependencies as array (thanks to Nicholas E.
           Rabenau).
+- TW-263  Unexpected zsh autocomplete behaviour (thanks to Leon Feng, Marc
+          Cornellà).
 - TW-269  \t is not rendered correctly (thanks to Scott Kostyshak).
 - TW-283  Process rc.* items when executing config (thanks to Ben Armstrong).
 - TW-303  Ability for "import" to update existing tasks (thanks to Kosta