diff --git a/winsup/cygwin/release/2.4.0 b/winsup/cygwin/release/2.4.0
index c22fb5dae..c5062307b 100644
--- a/winsup/cygwin/release/2.4.0
+++ b/winsup/cygwin/release/2.4.0
@@ -64,3 +64,7 @@ Bug Fixes
 
 - Fix a race condition in signal handling.
   Addresses: https://cygwin.com/ml/cygwin/2015-11/msg00387.html
+
+- Fix a potential crash reading invalid passwd and group entries from
+  /etc/passwd and /etc/group.
+  Addresses: https://cygwin.com/ml/cygwin/2015-12/msg00170.html