diff --git a/libio/testsuite/ChangeLog b/libio/testsuite/ChangeLog
index 351cbb93dac0..308f55f5f722 100644
--- a/libio/testsuite/ChangeLog
+++ b/libio/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Fri Sep  5 15:38:37 1997  Jeffrey A Law  (law@cygnus.com)
+
+	* lib/libio.exp  (test_libio): Use libstdc++_{include,link}_flags
+	instead of g++_{include,link}_flags.
+
 Fri Jun 27 18:19:21 1997  Bob Manson  <manson@charmed.cygnus.com>
 
 	* lib/libio.exp(libio_init): New procedure.
diff --git a/libio/testsuite/lib/libio.exp b/libio/testsuite/lib/libio.exp
index 22bd3b9c8ffa..c3d81d458635 100644
--- a/libio/testsuite/lib/libio.exp
+++ b/libio/testsuite/lib/libio.exp
@@ -65,8 +65,8 @@ proc test_libio { srcfile compile_args inpfile resultfile exec_args } {
 
     if [regexp "\.cc$" $srcfile] {
 	lappend args "additional_flags=-nostdinc++"
-	lappend args "additional_flags=[g++_include_flags]";
-	lappend args "additional_flags=[g++_link_flags]";
+	lappend args "additional_flags=[libstdc++_include_flags]";
+	lappend args "additional_flags=[libstdc++_link_flags]";
 	lappend args "libs=-lstdc++"
     } else {
 	if [info exists LIBIO] {