2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 09e89ceaf..e60ad77b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2020-04-05  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 45656: Etc/BUGS: Document the -o emacs segfault bug.
+
 2020-04-02  Mikael Magnusson  <mikachu@gmail.com>
 
 	* 45142: Doc/Zsh/grammar.yo, Doc/Zsh/options.yo, Src/lex.c,
diff --git a/Etc/BUGS b/Etc/BUGS
index 8112299f5..c5c7cbc17 100644
--- a/Etc/BUGS
+++ b/Etc/BUGS
@@ -29,3 +29,6 @@ skipped when STTY=... is set for that command
 44007 - Martijn - exit in trap executes rest of function
 See test case in Test/C03traps.ztst.
 ------------------------------------------------------------------------
+45656: 'zsh -o nobanghist -o emacs' segfaults
+analysis in workers/45657
+------------------------------------------------------------------------