diff --git a/_security/CVE-2017-3158.md b/_security/CVE-2017-3158.md
new file mode 100644
index 0000000..5f28bdb
--- /dev/null
+++ b/_security/CVE-2017-3158.md
@@ -0,0 +1,13 @@
+---
+title: Buffer overflow in SSH/telnet terminal emulator
+cve:   CVE-2017-3158
+fixed: 0.9.11-incubating
+---
+
+A race condition in Guacamole's terminal emulator could allow writes of blocks
+of printed data to overlap. Such overlapping writes could cause packet data to
+be misread as the packet length, resulting in the remaining data being written
+beyond the end of a statically-allocated buffer.
+
+Acknowledgements: We would like to thank Hariprasad Ng for reporting this
+issue.