diff --git a/ChangeLog b/ChangeLog
index bfc2d6d73e..0625ce546f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jan 28 13:07:02 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/iconv/extconf.rb: include iconv.h for libiconv.  [ruby-dev:22715]
+
 Wed Jan 28 12:43:07 2004  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* lib/rss: rss library imported. [ruby-dev:22726]
diff --git a/ext/iconv/extconf.rb b/ext/iconv/extconf.rb
index 73174a17f2..9e6c266bc7 100644
--- a/ext/iconv/extconf.rb
+++ b/ext/iconv/extconf.rb
@@ -6,7 +6,7 @@ conf = File.exist?(File.join($srcdir, "config.charset"))
 conf = with_config("config-charset", enable_config("config-charset", conf))
 
 if have_header("iconv.h")
-  if !try_compile("", "-Werror") or checking_for("iconv() 2nd argument is const") do
+  if !try_compile("", "-Werror") or checking_for("const of iconv() 2nd argument") do
       !try_compile('
 #include <iconv.h>
 size_t
@@ -20,7 +20,7 @@ test(iconv_t cd, char **inptr, size_t *inlen, char **outptr, size_t *outlen)
   else
     $defs.push('-DICONV_INPTR_CAST="(char **)"')
   end
-  have_library("iconv", "iconv")
+  have_library("iconv", "iconv") {|s| s.sub(/(?=\n\/\*top\*\/)/, "#include <iconv.h>")}
   if conf
     prefix = '$(srcdir)'
     prefix =  $nmake ? "{#{prefix}}" : "#{prefix}/"