diff --git a/ChangeLog b/ChangeLog
index d4587345..df0c2ae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-26  Assar Westerlund  <assar@sics.se>
+
+	* autoreconf.sh (find): Fix precedence.
+	(aclocal): Same as below for autoheader.
+
 2001-01-26  Akim Demaille  <akim@epita.fr>
 
 	* autoreconf.sh (autoheader): Run it when there is no template, as
diff --git a/autoreconf.in b/autoreconf.in
index 6ecabf75..6b285a31 100644
--- a/autoreconf.in
+++ b/autoreconf.in
@@ -298,7 +298,7 @@ update="@SHELL@ $tmp/update.sh"
 
 # Make a list of directories to process.
 # The xargs grep filters out Cygnus configure.in files.
-find . -name configure.ac -o -name configure.in -print |
+find . '(' -name configure.ac -o -name configure.in ')' -print |
 xargs grep -l AC_INIT |
 sed 's,/configure\.ac$,,;s,/configure\.in$,,;s,^./,,' |
 while read dir; do
@@ -312,10 +312,10 @@ while read dir; do
 
   # uses_aclocal -- is this package using aclocal?
   uses_aclocal=false
-  if grep 'generated .* by aclocal' $localdir/aclocal.m4 >/dev/null 2>&1 ||
-     test -f "$localdir/acinclude.m4"; then
+  grep 'generated .* by aclocal' $localdir/aclocal.m4 >/dev/null 2>&1 &&
+     uses_aclocal=:
+  test -f "$localdir/aclocal.m4" ||
      uses_aclocal=:
-  fi
   if $uses_aclocal &&
      { $force ||
        $update $localdir/aclocal.m4 $localdir/acinclude.m4; } then
diff --git a/autoreconf.sh b/autoreconf.sh
index 6ecabf75..6b285a31 100644
--- a/autoreconf.sh
+++ b/autoreconf.sh
@@ -298,7 +298,7 @@ update="@SHELL@ $tmp/update.sh"
 
 # Make a list of directories to process.
 # The xargs grep filters out Cygnus configure.in files.
-find . -name configure.ac -o -name configure.in -print |
+find . '(' -name configure.ac -o -name configure.in ')' -print |
 xargs grep -l AC_INIT |
 sed 's,/configure\.ac$,,;s,/configure\.in$,,;s,^./,,' |
 while read dir; do
@@ -312,10 +312,10 @@ while read dir; do
 
   # uses_aclocal -- is this package using aclocal?
   uses_aclocal=false
-  if grep 'generated .* by aclocal' $localdir/aclocal.m4 >/dev/null 2>&1 ||
-     test -f "$localdir/acinclude.m4"; then
+  grep 'generated .* by aclocal' $localdir/aclocal.m4 >/dev/null 2>&1 &&
+     uses_aclocal=:
+  test -f "$localdir/aclocal.m4" ||
      uses_aclocal=:
-  fi
   if $uses_aclocal &&
      { $force ||
        $update $localdir/aclocal.m4 $localdir/acinclude.m4; } then
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 6ecabf75..6b285a31 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -298,7 +298,7 @@ update="@SHELL@ $tmp/update.sh"
 
 # Make a list of directories to process.
 # The xargs grep filters out Cygnus configure.in files.
-find . -name configure.ac -o -name configure.in -print |
+find . '(' -name configure.ac -o -name configure.in ')' -print |
 xargs grep -l AC_INIT |
 sed 's,/configure\.ac$,,;s,/configure\.in$,,;s,^./,,' |
 while read dir; do
@@ -312,10 +312,10 @@ while read dir; do
 
   # uses_aclocal -- is this package using aclocal?
   uses_aclocal=false
-  if grep 'generated .* by aclocal' $localdir/aclocal.m4 >/dev/null 2>&1 ||
-     test -f "$localdir/acinclude.m4"; then
+  grep 'generated .* by aclocal' $localdir/aclocal.m4 >/dev/null 2>&1 &&
+     uses_aclocal=:
+  test -f "$localdir/aclocal.m4" ||
      uses_aclocal=:
-  fi
   if $uses_aclocal &&
      { $force ||
        $update $localdir/aclocal.m4 $localdir/acinclude.m4; } then