diff --git a/ChangeLog b/ChangeLog
index 9995d083d5..32d3ba66b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 19 20:43:39 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/socket/getnameinfo.c: need to include extconf.h for HAVE_* macros.
+	  reported by Kenta Murata <mrkn AT mrkn.jp> via IRC.
+
 Thu Nov 19 17:00:59 2009  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/Makefile.sub: nmake execute the file named echo if it exists
diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c
index 689b91c291..62a14ac555 100644
--- a/ext/socket/getnameinfo.c
+++ b/ext/socket/getnameinfo.c
@@ -35,6 +35,9 @@
  */
 
 #include "ruby/config.h"
+#ifdef RUBY_EXTCONF_H
+#include RUBY_EXTCONF_H
+#endif
 #include <stdio.h>
 #include <sys/types.h>
 #ifndef _WIN32