diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index de6c35c7117..035adc0c5a5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-12  David Edelsohn  <edelsohn@gnu.org>
+
+        * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Add test for
+        libiconv.a providing wchar_t support functions.
+	* aclocal.m4: Regenerate.
+	
 2000-11-12  Loren J. Rittle  <ljrittle@acm.org>
 
         * acinclude.m4 (GLIBCPP_ENABLE_ATOMICITY): Handle FreeBSD.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index dc267fb8402..9ce0382bc1b 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1083,6 +1083,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
       dnl X/Open Portability Guide, version 2 features (XPG2).
       AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no)
       AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no)
+
+      dnl Check for existence of libiconv.a providing XPG2 wchar_t support.
+      AC_CHECK_LIB(iconv, iconv, libiconv="-liconv")
+      ac_save_LIBS="$LIBS"
+      LIBS="$LIBS $libiconv"
+
       AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \
       ac_XPG2funcs=yes, ac_XPG2funcs=no)