diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c8737338f19..fd18cf9b1c8 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-29  Gabriel Dos Reis  <gdr@codesourcery.com>
+
+	* tests_flags (SH_FLAGS, ST_FLAGS): Move them back to ...
+	* mkcheck.in (SH_FLAGS, ST_FLAGS): ...here
+
 2000-11-29  Gabriel Dos Reis  <gdr@codesourcery.com>
 
 	* src/Makefile.am (sources): Add bitset.cc
diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index e27c4cca387..83508e793e5 100755
--- a/libstdc++-v3/mkcheck.in
+++ b/libstdc++-v3/mkcheck.in
@@ -56,6 +56,13 @@ set `./tests_flags ${query} $*` || exit 1
 BUILD_DIR=$1; SRC_DIR=$2; PREFIX_DIR=$3; LTCXX=$4; LIBS=$5; LTEXE=$6; CXX=$7; CXXFLAGS=$8;
 IFS=$saved_ifs
 
+# specific libtool flag(s) to force the use of shared libraries, if any
+SH_FLAGS=
+
+# specific libtool flag(s) to force the use of static libraries, if any
+ST_FLAGS="-static"
+#ST_FLAGS="-all-static"
+
 # Set up the testing directory, which should be in a directory called
 # "testsuite" in the root level of the build directory.
 TEST_DIR="`pwd`/testsuite"
diff --git a/libstdc++-v3/tests_flags.in b/libstdc++-v3/tests_flags.in
index b44bb8c90d9..3de5b4efb16 100644
--- a/libstdc++-v3/tests_flags.in
+++ b/libstdc++-v3/tests_flags.in
@@ -146,13 +146,6 @@ esac
 # but thst's really meant for building the library itself, not using it)
 CXXFLAGS="-ggdb3 -DDEBUG_ASSERT @SECTION_FLAGS@ @SECTION_LDFLAGS@"
 
-# specific libtool flag(s) to force the use of shared libraries, if any
-SH_FLAGS=
-
-# specific libtool flag(s) to force the use of static libraries, if any
-ST_FLAGS="-static"
-#ST_FLAGS="-all-static"
-
 # LTCXX == how to call libtool when creating an executable
 # LIBS == any extra needed -l switches, etc (may need more libs, lose lose)
 case ${query} in