diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6b657f900fcb01ca237db988e8d0b18275bae9e2..7b7ec1e2a73a703d32d8c65ae867b38e6fce5fb0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-01  David Billinghurst <David.Billinghurst@riotinto.com>
+
+	* tests_flags.in: Fix typo in usage.
+
+	* tests_flags.in: Set target specific LIBS for cygwin.
+
 2000-12-31  Alexandre Oliva  <aoliva@redhat.com>
 
 	* include/c_std/bits/std_cstdlib.h (mblen): Protect against macro.
diff --git a/libstdc++-v3/tests_flags.in b/libstdc++-v3/tests_flags.in
index 2e2e59b983d17f4d9b5ee300d05b0950e709ddfa..017c0d0f0ca221ee02645eb5e5d9080fdc41f0e3 100644
--- a/libstdc++-v3/tests_flags.in
+++ b/libstdc++-v3/tests_flags.in
@@ -41,7 +41,7 @@
 print_usage() {
     cat <<EOF
 Usage: 
-  tests_fags --compiler <build-dir> <src-dir>
+  tests_flags --compiler <build-dir> <src-dir>
              --built-library <build-dir>  <src-dir>
              --installed-library <build-dir> <src-dir> <install-dir>
 EOF
@@ -154,7 +154,11 @@ case ${query} in
 	   ${LIB_PATH}/../libsupc++/libsupc++.la  ${LIB_PATH}/libstdc++.la
 	   -no-install"
     LTEXE="${LIBTOOL} --mode=execute"
-    LIBS="-nodefaultlibs -lc -lgcc -lc"
+    case @target_os@ in
+        *cygwin*)  LIBS="-nodefaultlibs -lgcc -lcygwin -luser32
+                         -lkernel32 -ladvapi32 -lshell32" ;;
+        *)         LIBS="-nodefaultlibs -lc -lgcc -lc" ;;
+    esac
     ;;
     --installed-library)
     # For the installed version, we really only need to use libtool and