diff --git a/config/tcl.m4 b/config/tcl.m4
index 094dcd1299..398bf78812 100644
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -1,10 +1,10 @@
-# $PostgreSQL: pgsql/config/tcl.m4,v 1.6 2008/07/23 17:07:49 petere Exp $
+# $PostgreSQL: pgsql/config/tcl.m4,v 1.7 2008/08/01 13:50:52 alvherre Exp $
 
 # Autoconf macros to check for Tcl related things
 
 
 AC_DEFUN([PGAC_PATH_TCLSH],
-[AC_PATH_PROGS(TCLSH, [tclsh tcl])
+[AC_PATH_PROGS(TCLSH, [tclsh tcl tclsh8.5 tclsh8.4 tclsh8.3])
 if test x"$TCLSH" = x""; then
   AC_MSG_ERROR([Tcl shell not found])
 fi
diff --git a/configure b/configure
index 8029882b01..f6815d3b1c 100755
--- a/configure
+++ b/configure
@@ -24987,7 +24987,7 @@ fi
 
 # Check for Tcl configuration script tclConfig.sh
 if test "$with_tcl" = yes; then
-    for ac_prog in tclsh tcl
+    for ac_prog in tclsh tcl tclsh8.5 tclsh8.4 tclsh8.3
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2