diff --git a/AUTHORS b/AUTHORS
index 9bf5760ec..2d385ac5c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -181,3 +181,4 @@ suggestions:
   Roy Zuo
   Friedrich Heusler
   Ben Armstrong
+  XTaran
diff --git a/ChangeLog b/ChangeLog
index cb18a2c64..a6750a19c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -71,6 +71,8 @@ Bugs
    Weber).
  + #1300 Encode/decode pairing is now properly balanced.
  + #1305 Commit hash now available in tarball builds (thanks to Ben Boeckel).
+ + #1352 Terminal crashes when using taskwarrior's zsh completion (thanks to
+   Ivan Freitas, XTaran).
  + #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
diff --git a/NEWS b/NEWS
index f2be4833e..d41760c3b 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,13 @@ Newly deprecated features in taskwarrior 2.3.0
   - The 'diagnostics' command no longer generates 1000 UUIDs as a uniqueness
     test, because libuuid is now mandatory.
 
+Known Issues
+
+  - There is a zsh bug (fixed, but not necessarily updated in your OS) that can
+    cause the terminal to crash when completion is invoked.  See the issue for
+    full details:
+    http://taskwarrior.org/issues/1352
+
 ---
 
 Taskwarrior has been built and tested on the following configurations: