diff --git a/lib/ChangeLog b/lib/ChangeLog
index eaf459d..6f23637 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-29  Greg Troxel  <gdt@poblano.ir.bbn.com>
+
+	* sockopt.c (getsockopt_ipv4_ifindex): Return 0 when passed a NULL
+	  cmsghdr pointer.
+
 2004-12-28 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
 
 	* sockopt.c: (setsockopt_ipv4_ifindex) Improve error message.