diff --git a/ChangeLog b/ChangeLog
index 2b440bda96..76490ab8ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Feb  4 01:28:46 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/extconf.rb: fix struct in_pktinfo and struct in6_pktinfo
+	  detection.
+
 Wed Feb  4 00:32:59 2009  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/etc/test_etc.rb(test_getpwnam, test_getgrgid, test_getgrnam):
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index f4d92066b9..d610657a1d 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -299,13 +299,13 @@ end
 
 have_header("sys/un.h")
 have_header("sys/uio.h")
-have_type("struct in_pktinfo") {|src|
+have_type("struct in_pktinfo", headers) {|src|
   src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IP) && defined(IP_PKTINFO)") <<
-  "#else\n" << "#error\n" << ">>>>>> no in_pktinfo <<<<<<\n" << "#endif\n"
+  "#else\n" << "#error no in_pktinfo\n" << "#endif\n"
 }
-have_type("struct in6_pktinfo") {|src|
+have_type("struct in6_pktinfo", headers) {|src|
   src.sub(%r'^/\*top\*/', '\1'"\n#if defined(IPPROTO_IPV6) && defined(IPV6_PKTINFO)") <<
-  "#else\n" << "#error\n" << ">>>>>> no in6_pktinfo <<<<<<\n" << "#endif\n"
+  "#else\n" << "#error no in6_pktinfo\n" << "#endif\n"
 }
 
 $distcleanfiles << "constants.h" << "constdefs.*"