diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1563a6d480e..aeb77f7e224 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-07  Robert Millan  <robertmh@gnu.org>
+
+        * configure.host: Add kfreebsd*-gnu and knetbsd*-gnu.
+        * crossconfig.m4: Likewise.
+        * configure: Regenerate.
+
 2003-11-07  Carlo Wood  <carlo@alinoe.com>
 
         * include/bits/demangle.h
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index bfa0fa593b3..72ecf6db4fc 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -51190,7 +51190,7 @@ _ACEOF
 	;;
     esac
     ;;
-  *-linux* | *-uclinux* | *-gnu*)
+  *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
 
 
 
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index de19fcabc62..f5a8f899c2e 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -146,7 +146,7 @@ case "${host_os}" in
   freebsd*)
     os_include_dir="os/bsd/freebsd"
     ;;
-  gnu* | linux*)
+  gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
     os_include_dir="os/gnu-linux"
     ;;
   hpux*)
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 7bd3bacabd3..a86a51c6542 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -123,7 +123,7 @@ case "${host}" in
 	;;
     esac
     ;;
-  *-linux* | *-uclinux* | *-gnu*)
+  *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
     AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
       machine/endian.h machine/param.h sys/machine.h sys/types.h \
       fp.h locale.h float.h inttypes.h])