diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index a1e662c7c329f321142b3c12f69059c3aefef91a..7e165e9bb0424a9a9ae8aae416538f179d8b73cd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-12  Jan Beulich  <jbeulich@novell.com>
+
+	* crossconfig.m4: Add AC_DEFINE-s for HAVE_HYPOT, HAVE_ISINF, and
+	HAVE_ISNAN for *-*-netware*.
+	* configure: Refresh.
+
 2006-01-11  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* acinclude.m4: Use -Wl,-z,relro if possible.
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index bcd04af75e65c7af7074bfa12bc360fdb453b683..4b32f431d0ce28401f5fb412a277e4ff7a2b4743 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -83223,6 +83223,18 @@ echo $ECHO_N "checking for enabled iconv specializations... $ECHO_C" >&6
   echo "$as_me:$LINENO: result: $enable_iconv" >&5
 echo "${ECHO_T}$enable_iconv" >&6
 
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_HYPOT 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ISINF 1
+_ACEOF
+
+    cat >>confdefs.h <<\_ACEOF
+#define HAVE_ISNAN 1
+_ACEOF
+
 
     # For showmanyc_helper().
 
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 200aa6275cc8ecf4f54327c64d6c3a9de2552468..ec43775be292c158b9b8740fa9567cac9c6c4335 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -273,6 +273,9 @@ case "${host}" in
     GLIBCXX_CHECK_LINKER_FEATURES
     GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
     GLIBCXX_CHECK_ICONV_SUPPORT
+    AC_DEFINE(HAVE_HYPOT)
+    AC_DEFINE(HAVE_ISINF)
+    AC_DEFINE(HAVE_ISNAN)
 
     # For showmanyc_helper().
     AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)