diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 1b7d60361b753e01bc77238a764f448122e2c6c2..642917e1573e19ada7e31507f0b38180f41b5f10 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* Make-lang.in (check-gnat): Run run_acats with $(SHELL).
+
 2006-02-06  Roger Sayle  <roger@eyesopen.com>
 
 	* decl.c (gnat_substitute_in_type): Don't handle CHAR_TYPE.
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index c6e4ad5e87629eb20b29a7c1ce4619af77e26252..4d2dd8588994f46f982f0360b8c2e708b193926d 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -1,6 +1,6 @@
 # Top level -*- makefile -*- fragment for GNU Ada (GNAT).
 #   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-#   2003, 2004, 2005 Free Software Foundation, Inc.
+#   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 #This file is part of GCC.
 
@@ -822,7 +822,7 @@ ACATSDIR = $(TESTSUITEDIR)/ada/acats
 check-gnat:
 	test -d $(ACATSDIR) || mkdir -p $(ACATSDIR)
 	testdir=`cd ${srcdir}/${ACATSDIR}; ${PWD_COMMAND}`; \
-	export testdir; cd $(ACATSDIR); $${testdir}/run_acats $(CHAPTERS)
+	export testdir; cd $(ACATSDIR); $(SHELL) $${testdir}/run_acats $(CHAPTERS)
 
 .PHONY: check-gnat
 
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9ba4259cafa967fdb147c76f202ebcdf02522020..8be7f5d0d274ca91d33ec86007c27acc0cfd3ca7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-09  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* ada/acats/run_acats: Use portable variant of "$@".
+
 2006-02-09  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	* g++.old-deja/g++.benjamin/15351-2.C: Likewise.
diff --git a/gcc/testsuite/ada/acats/run_acats b/gcc/testsuite/ada/acats/run_acats
index f2b7872b10fd8b480a685bbfa5ba655b486d7124..b3b74cca2df5703da4ffdc661a7e3bd42815e308 100755
--- a/gcc/testsuite/ada/acats/run_acats
+++ b/gcc/testsuite/ada/acats/run_acats
@@ -52,4 +52,4 @@ echo exec $host_gnatmake '"$@"' >> host_gnatmake
 
 chmod +x host_gnatmake
 
-exec $testdir/run_all.sh "$@"
+exec $testdir/run_all.sh ${1+"$@"}