diff --git a/ChangeLog b/ChangeLog
index 48d9517fb..ced77ab10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-10   Holger Vogt / (Robert Larice)
+ * src/frontend/cpitf.c :
+   search for tclspinit in `cwd' as well
+
 2012-02-10   Holger Vogt / (Robert Larice)
  * src/frontend/postcoms.c :
    NG_IGNORE something
diff --git a/src/frontend/cpitf.c b/src/frontend/cpitf.c
index bfcd38f50..308892920 100644
--- a/src/frontend/cpitf.c
+++ b/src/frontend/cpitf.c
@@ -257,7 +257,11 @@ ft_cpinit(void)
                 break;
 #if defined (HAS_WINDOWS) || defined (__MINGW32__) || defined (_MSC_VER)
             /* search in local directory where ngspice.exe resides */
+#if defined TCL_MODULE
+            } else if ((fp = fopen("./tclspinit", "r")) != NULL) {
+#else
             } else if ((fp = fopen("./spinit", "r")) != NULL) {
+#endif
                 cp_interactive = FALSE;
                 inp_spsource(fp, TRUE, buf);
                 cp_interactive = TRUE;