diff --git a/ChangeLog b/ChangeLog
index b86a408ee..b512840f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-07-15  Alexandre Duret-Lutz  <aduret@src.lip6.fr>
 
+	* m4/lbtt.m4 (AX_CHECK_LBTT): Set LBTT and LBTT_TRANSLATE
+	when using an already installed lbtt.
+
 	Homogenize passing of automata as pointers, not references.
 	Disallow copy for security.
 
diff --git a/m4/lbtt.m4 b/m4/lbtt.m4
index 2bfd07f23..09e191c1f 100644
--- a/m4/lbtt.m4
+++ b/m4/lbtt.m4
@@ -3,13 +3,13 @@ AC_DEFUN([AX_CHECK_LBTT], [
 	      [AC_HELP_STRING([--with-included-lbtt],
 			      [use the LBTT program inclued here])])
   AS_IF([AM_RUN_LOG([lbtt-translate --help | grep spot])],
-        [need_included_lbtt=no],
+	[need_included_lbtt=no],
 	[need_included_lbtt=yes])
 
   if test "$need_included_lbtt" = yes; then
      if test "$with_included_lbtt" = no; then
        AC_MSG_ERROR([Cannot find lbtt.  Please install lbtt first,
-	             or configure with --with-included-lbtt])
+		     or configure with --with-included-lbtt])
      else
 	with_included_lbtt=yes
      fi
@@ -19,6 +19,9 @@ AC_DEFUN([AX_CHECK_LBTT], [
      AC_CONFIG_SUBDIRS([lbtt])
      LBTT='${top_builddir}/lbtt/src/lbtt'
      LBTT_TRANSLATE='${top_builddir}/lbtt/src/lbtt-translate'
+  else
+     LBTT=lbtt
+     LBTT_TRANSLATE=lbtt-translate
   fi
   AM_CONDITIONAL([WITH_INCLUDED_LBTT], [test "$with_included_lbtt" = yes])
   AC_SUBST([LBTT])