diff --git a/configure.in b/configure.in
index e5171e28e..c6dc2d0b4 100644
--- a/configure.in
+++ b/configure.in
@@ -482,16 +482,22 @@ if test "$enable_xspice" = "yes"; then
 	        $XSPICEDIR/ipc/libipcxsp.a \
 		$XSPICEDIR/idn/libidnxsp.a \
 		-ldl"
+    XSPICEINIT=""    
+    XSPICETESTS=""		
+		
 
 else
     XSPCIEDIR=""
     XSPICELIB1=""
     XSPICELIB2=""
     XSPICETESTS=""
+    XSPICEINIT="*"
 fi
 AC_SUBST(XSPICEDIR)
 AC_SUBST(XSPICELIB1)
 AC_SUBST(XSPICELIB2)
+AC_SUBST(XSPICETESTS)
+AC_SUBST(XSPICEINIT)
 
 dnl Add CIDER enhacements to ngspice.
 if test "$enable_cider" = "yes"; then
diff --git a/src/spinit.in b/src/spinit.in
index a81984c76..40d06acd8 100644
--- a/src/spinit.in
+++ b/src/spinit.in
@@ -2,12 +2,13 @@
 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
+@XSPICEINIT@ 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
+@XSPICEINIT@ codemodel @prefix@/lib/spice/analog.cm
+@XSPICEINIT@ codemodel @prefix@/lib/spice/digital.cm
+@XSPICEINIT@ codemodel @prefix@/lib/spice/xtradev.cm
+@XSPICEINIT@ codemodel @prefix@/lib/spice/xtraevt.cm