diff --git a/ChangeLog b/ChangeLog
index 87247b0fd..796ddaa07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-10  Paolo Nenzi <p.nenzi@ieee.org>
 
+	*  src/spinit, arc/spinit.in, configure.in: parametrized spinit paths
+	   for codemodel devices.
+
 	*  src/Makefile.am, src/ngspice.idx: removed ngspice.idx
 	   and make it auto-generated and installed (Stefan Jones).
 
diff --git a/configure.in b/configure.in
index 3b28e0aa1..cfbe1de43 100644
--- a/configure.in
+++ b/configure.in
@@ -280,7 +280,7 @@ AC_CACHE_CHECK([for va_copy], ac_cv_c_va_copy,
    ],
    [ac_cv_c_va_copy="yes"],
    [ac_cv_c_va_copy="no"])
-)
+ )
 if test "$ac_cv_c_va_copy" = "yes"
 then 
     AC_DEFINE(HAVE_VA_COPY, 1, [Define if we have va_copy])
@@ -293,7 +293,7 @@ AC_CACHE_CHECK([for __va_copy], ac_cv_c___va_copy,
    ],
    [ac_cv_c___va_copy="yes"],
    [ac_cv_c___va_copy="no"])
-)
+ )
 if test "$ac_cv_c___va_copy" = "yes"
 then
     AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy])
@@ -418,7 +418,7 @@ if test "$enable_xspice" = "yes"; then
 else
     XSPCIEDIR=""
     XSPICELIB1=""
-    XSPICELIB2=""	
+    XSPICELIB2=""
 fi
 AC_SUBST(XSPICEDIR)
 AC_SUBST(XSPICELIB1)
@@ -508,6 +508,7 @@ doc/Makefile			\
 man/Makefile			\
 man/man1/Makefile		\
 src/Makefile			\
+src/spinit			\
 src/spicelib/Makefile		\
 src/spicelib/analysis/Makefile	\
 src/spicelib/devices/Makefile		\
@@ -532,7 +533,7 @@ src/spicelib/devices/ccvs/Makefile	\
 src/spicelib/devices/csw/Makefile	\
 src/spicelib/devices/cpl/Makefile       \
 src/spicelib/devices/dio/Makefile	\
-dnl src/spicelib/devices/ekv/Makefile	\
+dnl            src/spicelib/devices/ekv/Makefile	\
 src/spicelib/devices/ind/Makefile	\
 src/spicelib/devices/isrc/Makefile	\
 src/spicelib/devices/hfet1/Makefile	\
@@ -554,6 +555,7 @@ src/spicelib/devices/sw/Makefile	\
 src/spicelib/devices/tra/Makefile	\
 src/spicelib/devices/txl/Makefile       \
 src/spicelib/devices/urc/Makefile	\
+src/spicelib/devices/vbic/Makefile      \
 src/spicelib/devices/vccs/Makefile	\
 src/spicelib/devices/vcvs/Makefile	\
 src/spicelib/devices/vsrc/Makefile	\
diff --git a/src/spinit.in b/src/spinit.in
new file mode 100644
index 000000000..a81984c76
--- /dev/null
+++ b/src/spinit.in
@@ -0,0 +1,13 @@
+* Standard spice and nutmeg init file
+alias exit quit
+alias acct rusage all
+set x11lineararcs
+* For SPICE2 POLYs, edit the below line to point to the location 
+* of your codemode.
+* codemodel @prefix@/lib/spice/spice2poly.cm
+
+* The other codemodels
+* codemodel @prefix@/lib/spice/analog.cm
+* codemodel @prefix@/lib/spice/digital.cm
+* codemodel @prefix@/lib/spice/xtradev.cm
+* codemodel @prefix@/lib/spice/xtraevt.cm