diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 45f341e3756..f385940a37d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,8 @@
 	* ada/acats/run_all.sh: Change output to be more compliant with
 	dejagnu framework.
 	Create acats.sum and acats.log files under testsuite/ada/acats
+	Only run [a-z]* directories, to filter out e.g. CVS.
+	Redirect build output to log file.
 
 2003-10-27  Arnaud Charlet  <charlet@act-europe.fr>
 
diff --git a/gcc/testsuite/ada/acats/run_all.sh b/gcc/testsuite/ada/acats/run_all.sh
index b63af81e1e3..c4a171a793a 100755
--- a/gcc/testsuite/ada/acats/run_all.sh
+++ b/gcc/testsuite/ada/acats/run_all.sh
@@ -141,7 +141,7 @@ display ""
 display "	=== ACATS tests ==="
 
 if [ $# -eq 0 ]; then
-   chapters=`cd $dir/tests; echo *`
+   chapters=`cd $dir/tests; echo [a-z]*`
 else
    chapters=$*
 fi
@@ -199,7 +199,7 @@ for chapter in $chapters; do
          continue
       fi
 
-      target_gnatmake $extraflags -I$dir/support $main
+      target_gnatmake $extraflags -I$dir/support $main >> $dir/acats.log 2>&1
       if [ $? -ne 0 ]; then
          display "FAIL:	$i"
          failed="${failed}${i} "