diff --git a/bootstrap b/bootstrap
index 54f4b40..7cda9f5 100755
--- a/bootstrap
+++ b/bootstrap
@@ -31,11 +31,13 @@ header="`grep -q '^[ \t]*A._CONFIG_HEADER' $conffile && echo yes || echo no`"
 
 # Check for automake
 amvers="no"
-for v in "-1.9" "19" "-1.8" "18" "-1.7" "17" "-1.6" "16" "-1.5" "15"; do
-  if automake${v} --version >/dev/null 2>&1; then
-    amvers="${v}"
-    break
-  fi
+for n in 10 9 8 7 6 5; do
+  for v in "-1.${n}" "1${n}"; do
+    if automake${v} --version >/dev/null 2>&1; then
+      amvers="${v}"
+      break
+    fi
+  done
 done
 
 if test "${amvers}" = "no" && automake --version > /dev/null 2>&1; then
diff --git a/configure.ac b/configure.ac
index 484b555..199d1b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -349,13 +349,16 @@ if test "${enable_doc}" != "no"; then
     if test "${DVIPS}" = "no"; then
       LATEX="no"
     fi
-    AC_MSG_CHECKING(for a4wide.sty)
-    if test -f /usr/share/texmf/tex/latex/misc/a4wide.sty; then
-      AC_MSG_RESULT(yes)
-    elif test -f /usr/share/texmf-tetex/tex/latex/a4wide/a4wide.sty; then
-      AC_MSG_RESULT(yes)
-    elif test -f /usr/share/texmf-texlive/tex/latex/ltxmisc/a4wide.sty; then
+    AC_MSG_CHECKING(for a4.sty)
+    if test "$(find /usr/share/texmf* -name 'a4.sty')" != ""; then
       AC_MSG_RESULT(yes)
+      AC_MSG_CHECKING(for a4wide.sty)
+      if test "$(find /usr/share/texmf* -name 'a4wide.sty')" != ""; then
+        AC_MSG_RESULT(yes)
+      else
+        LATEX="no"
+        AC_MSG_RESULT(no)
+      fi
     else
       LATEX="no"
       AC_MSG_RESULT(no)