diff --git a/ChangeLog b/ChangeLog
index 64248ff5c..9a09ee930 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003-07-09 Stefan Jones <stefan.jones@multigig.com>
+	* configure.in : Add extra check for tclreadline and headers
+
 2003-04-14 Stefan Jones <stefan.jones@multigig.com>
 
 	* Make all the devices in src/spicelib/devices be built as
diff --git a/configure.in b/configure.in
index f619b38ba..b3881c9f1 100644
--- a/configure.in
+++ b/configure.in
@@ -181,6 +181,8 @@ fi
 
 . $tcl_config_sh	
 
+AC_CHECK_HEADERS(tcl.h blt.h,,AC_MSG_ERROR(Couldn't find Tcl/BLT headers))
+
 AC_MSG_CHECKING(for TCL module BLT)
 rm -f conftest.tcl
 cat > conftest.tcl << EOF
@@ -194,6 +196,19 @@ else
 fi
 rm -f conftest.tcl
 
+AC_MSG_CHECKING(for TCL module tclreadline)
+rm -f conftest.tcl
+cat > conftest.tcl << EOF
+package require tclreadline;
+exit;
+EOF
+if (wish conftest.tcl; exit) 2>/dev/null; then
+   AC_MSG_RESULT(Found)
+else
+   AC_MSG_ERROR(Couldn't find tclreadline)
+fi
+rm -f conftest.tcl
+
 else
   TCL_PACKAGE_PATH=""
   TCL_BUILD_LIB_SPEC=""
@@ -491,5 +506,5 @@ tests/TransImpedanceAmp/Makefile
 
 dnl Printout Tcl option
 if test "$enable_tcl" = "yes"; then
-   echo 'Tcl module being made, use "make tcl" and "make install-tcl", read README in src/tcl/README'
+   echo 'Tcl module being made, use "make tcl" and "make install-tcl", read README.Tcl'
 fi