diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index 26728325bc4d9f8bb56c55acde1fa91ba208e0c5..b2f4232f81d44fefe2c442132c12648e2e69d54e 100644
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,10 @@
+2009-03-30  Sergiy Vyshnevetskiy  <serg@vostok.net>
+
+	PR preprocessor/31932:
+	* internal.h: Don't mention HAVE_ICONV_H.
+	* configure, config.in: Rebuild.
+	* configure.ac: Don't check for iconv.h.
+
 2009-03-30  Tom Tromey  <tromey@redhat.com>
 
 	PR preprocessor/39512:
diff --git a/libcpp/config.in b/libcpp/config.in
index 5d52ec1221039e0df667db3c7ca9b053c288a706..193f2a914330a4e79a6817ba63d1d9a8e721dfe9 100644
--- a/libcpp/config.in
+++ b/libcpp/config.in
@@ -158,9 +158,6 @@
 /* Define if you have the iconv() function. */
 #undef HAVE_ICONV
 
-/* Define to 1 if you have the <iconv.h> header file. */
-#undef HAVE_ICONV_H
-
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
diff --git a/libcpp/configure b/libcpp/configure
index d36ed250e70a54b9946da66c10f81c981cedc3f1..9a4f30ddfc01f5440d3f07873bc4dc7b984ef957 100755
--- a/libcpp/configure
+++ b/libcpp/configure
@@ -3619,8 +3619,7 @@ done
 
 
 
-
-for ac_header in iconv.h locale.h fcntl.h limits.h stddef.h \
+for ac_header in locale.h fcntl.h limits.h stddef.h \
 	stdlib.h strings.h string.h sys/file.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/libcpp/configure.ac b/libcpp/configure.ac
index fd098656248a3ba8b51ddb7c4dc0938a0bc82bc4..833eb435980b6d2bb5ea2b8aaf381e23b67e052a 100644
--- a/libcpp/configure.ac
+++ b/libcpp/configure.ac
@@ -37,7 +37,7 @@ ZW_PROG_COMPILER_DEPENDENCIES([CC])
 # Checks for header files.
 AC_HEADER_TIME
 ACX_HEADER_STRING
-AC_CHECK_HEADERS(iconv.h locale.h fcntl.h limits.h stddef.h \
+AC_CHECK_HEADERS(locale.h fcntl.h limits.h stddef.h \
 	stdlib.h strings.h string.h sys/file.h unistd.h)
 
 # Checks for typedefs, structures, and compiler characteristics.
diff --git a/libcpp/internal.h b/libcpp/internal.h
index d4eeda4bc61aea6990fddba05645730dde276dc1..38a80c68f37ba3b10ad3edde62c5811cc852f40b 100644
--- a/libcpp/internal.h
+++ b/libcpp/internal.h
@@ -26,10 +26,6 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 #include "symtab.h"
 #include "cpp-id-data.h"
 
-#ifndef HAVE_ICONV_H
-#undef HAVE_ICONV
-#endif
-
 #if HAVE_ICONV
 #include <iconv.h>
 #else