diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4da5edd796afd74c8459a22bb2ce9e56e861b3ae..885041db3e4caeb86d22159ece541d85719b4890 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-09  Bernardo Innocenti  <bernie@develer.com>
+
+	* crossconfig.m4: Don't enable _GLIBCXX_USE_LFS on *-uclinux*.
+	* configure: Regenerate.
+
 2004-02-08  Richard Henderson  <rth@redhat.com>
 
 	PR libstdc++/14026
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 8faed3be1b39964e9b0ddae40bef74a593e387fc..9fd8dc1e3edfed843f828c6cb3fe34704ed3b893 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -52843,10 +52843,16 @@ echo "${ECHO_T}$enable_wchar_t" >&6
 #define HAVE_INT64_T 1
 _ACEOF
 
-    cat >>confdefs.h <<\_ACEOF
+    case "$target" in
+      *-uclinux*)
+        # Don't enable LFS with uClibc
+        ;;
+      *)
+        cat >>confdefs.h <<\_ACEOF
 #define _GLIBCXX_USE_LFS 1
 _ACEOF
 
+    esac
 
     # For showmanyc_helper().
 
diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4
index 076063706fc3eecf395e1fe69942fd66c17dd58e..2c395e2c355d7d48b6f7e4ad0be7f3a31509b1e4 100644
--- a/libstdc++-v3/crossconfig.m4
+++ b/libstdc++-v3/crossconfig.m4
@@ -134,7 +134,13 @@ case "${host}" in
 
     # For LFS.
     AC_DEFINE(HAVE_INT64_T)
-    AC_DEFINE(_GLIBCXX_USE_LFS)
+    case "$target" in
+      *-uclinux*)
+        # Don't enable LFS with uClibc
+        ;;
+      *)
+        AC_DEFINE(_GLIBCXX_USE_LFS)
+    esac
 
     # For showmanyc_helper().
     AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)