diff --git a/ChangeLog b/ChangeLog
index ed7bbbc00..7f7981753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-23
+ * configure.in: modified for tclspinit.in
+ * src/tclspinit.in: spinit file for tclspice (at least until installation of
+  codemodels is solved)
+ * src/Makefile.am: modified for tclspinit installation
+ * src/frontend/cpitf.c: modified for use of tclspinit in tclspice
+
 2008-11-04 Holger Vogt
  * /doc/version.texi committed again
  * /visualc/include/config.h: version no. 18
diff --git a/configure.in b/configure.in
index 8faf34968..5d877216d 100644
--- a/configure.in
+++ b/configure.in
@@ -927,6 +927,7 @@ AC_CONFIG_FILES([Makefile
                  man/man1/Makefile
                  src/Makefile
                  src/spinit
+                 src/tclspinit
                  src/spicelib/Makefile
                  src/spicelib/analysis/Makefile
                  src/spicelib/devices/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 76d8f639b..7e914c015 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -241,6 +241,7 @@ if TCL_MODULE
 lib_LTLIBRARIES = libspice.la
 install: install-libLTLIBRARIES install-tcl-recursive install-tclspice install-data-am
 EXTRA_DIST += tclspice.c
+initdata_DATA += tclspinit
 
 libspice_la_SOURCES =
 libspice_la_LIBADD = ngspice.lo conf.lo \
diff --git a/src/frontend/cpitf.c b/src/frontend/cpitf.c
index 23e371971..a430f9f2f 100644
--- a/src/frontend/cpitf.c
+++ b/src/frontend/cpitf.c
@@ -219,7 +219,11 @@ ft_cpinit(void)
 		*r = *s;
 	    tfree(copys);	/* sjb - it's safe to free this here */
 	    (void) strcpy(r, DIR_PATHSEP);
+#ifdef TCL_MODULE
+            (void) strcat(r, "tclspinit");
+#else
 	    (void) strcat(r, "spinit");
+#endif
 	    if ((fp = fopen(buf, "r"))) {
 		cp_interactive = FALSE;
 		inp_spsource(fp, TRUE, buf);
diff --git a/src/tclspinit.in b/src/tclspinit.in
new file mode 100644
index 000000000..e07cc8044
--- /dev/null
+++ b/src/tclspinit.in
@@ -0,0 +1,24 @@
+* Standard spice and nutmeg init file
+alias exit quit
+alias acct rusage all
+set x11lineararcs
+
+*unset brief
+
+strcmp __flag $program "ngspice"
+if $__flag = 0
+
+*set numparams
+
+* For SPICE2 POLYs, edit the below line to point to the location 
+* of your codemode.
+@XSPICEINIT@ codemodel @libdir@/spice/spice2poly.cm
+
+* The other codemodels
+@XSPICEINIT@ codemodel @libdir@/spice/analog.cm
+@XSPICEINIT@ codemodel @libdir@/spice/digital.cm
+@XSPICEINIT@ codemodel @libdir@/spice/xtradev.cm
+@XSPICEINIT@ codemodel @libdir@/spice/xtraevt.cm
+
+end
+unset __flag