2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c7e9f1a1c..f4667ab2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-23  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* unposted: Etc/BUGS: Record users/20807 vcs_info quilt issue.
+
 2017-01-18  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 43080: Test/C04funcdef.ztst: a few more tests for autoload
diff --git a/Etc/BUGS b/Etc/BUGS
index 96958f992..a351464ac 100644
--- a/Etc/BUGS
+++ b/Etc/BUGS
@@ -22,3 +22,8 @@ string '%F{blue}', cause $vcs_info_msg_N_ to be rendered in blue.
 
 40240 has a patch, but 40241 explains why that patch is incomplete.
 ------------------------------------------------------------------------
+users/20807: vcs_info quilt 'addon' mode: hook lookup context specifies
+the underlying VCS but not whether quilt is used.
+
+Workaround: test (( ${+funcstack[(r)VCS_INFO_quilt]} )).
+------------------------------------------------------------------------