diff --git a/visualc/make-install-vngspice.bat b/visualc/make-install-vngspice.bat
index c232de528..870dd7c7a 100644
--- a/visualc/make-install-vngspice.bat
+++ b/visualc/make-install-vngspice.bat
@@ -21,7 +21,7 @@ copy %cmsrc%\table.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinit %dst%\share\ngspice\scripts\spinit
+copy .\spinit_orig %dst%\share\ngspice\scripts\spinit
 
 if "%2" == "fftw" goto copy2
 if "%3" == "fftw" goto copy2
@@ -50,7 +50,7 @@ copy %cmsrc%\table64.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt64.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev64.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly64.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinit64 %dst%\share\ngspice\scripts\spinit
+copy .\spinit_orig %dst%\share\ngspice\scripts\spinit
 
 if "%2" == "fftw" goto copy2-64
 if "%3" == "fftw" goto copy2-64
diff --git a/visualc/make-install-vngspiced.bat b/visualc/make-install-vngspiced.bat
index f455c5f6b..b7debc7f9 100644
--- a/visualc/make-install-vngspiced.bat
+++ b/visualc/make-install-vngspiced.bat
@@ -21,7 +21,7 @@ copy %cmsrc%\table.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinitd %dst%\share\ngspice\scripts\spinit
+copy .\spinit_orig %dst%\share\ngspice\scripts\spinit
 
 if "%2" == "fftw" goto copy2
 if "%3" == "fftw" goto copy2
@@ -50,7 +50,7 @@ copy %cmsrc%\table64.cm %dst%\lib\ngspice\table.cm
 copy %cmsrc%\xtraevt64.cm %dst%\lib\ngspice\xtraevt.cm
 copy %cmsrc%\xtradev64.cm %dst%\lib\ngspice\xtradev.cm
 copy %cmsrc%\spice2poly64.cm %dst%\lib\ngspice\spice2poly.cm
-copy .\spinitd64 %dst%\share\ngspice\scripts\spinit
+copy .\spinit_orig %dst%\share\ngspice\scripts\spinit
 
 if "%2" == "fftw" goto copy2-64
 if "%3" == "fftw" goto copy2-64
diff --git a/visualc/spinit b/visualc/spinit
deleted file mode 100644
index 8e4832c80..000000000
--- a/visualc/spinit
+++ /dev/null
@@ -1,33 +0,0 @@
-* Standard ngspice init file
-alias exit quit
-alias acct rusage all
-set x11lineararcs
-*set rndseed=12
-** ascii rawfile **
-set filetype=ascii
-** frontend debug output **
-*set ngdebug
-** asking after quit **
-*set askquit
-** set the number of threads in openmp
-** default (if compiled with --enable-openmp) is: 2
-set num_threads=4
-set interactive
-
-strcmp __flag $program "ngspice"
-if $__flag = 0
-
-* For SPICE2 POLYs, edit the below line to point to the location
-* of your codemodel.
-
- codemodel C:/Spice/lib/ngspice/spice2poly.cm
-
-* The other codemodels
- codemodel C:/Spice/lib/ngspice/analog.cm
- codemodel C:/Spice/lib/ngspice/digital.cm
- codemodel C:/Spice/lib/ngspice/xtradev.cm
- codemodel C:/Spice/lib/ngspice/xtraevt.cm
- codemodel C:/Spice/lib/ngspice/table.cm
-
-end
-unset __flag
diff --git a/visualc/spinit64 b/visualc/spinit64
deleted file mode 100644
index 47809f090..000000000
--- a/visualc/spinit64
+++ /dev/null
@@ -1,33 +0,0 @@
-* Standard ngspice init file
-alias exit quit
-alias acct rusage all
-set x11lineararcs
-*set rndseed=12
-** ascii rawfile **
-set filetype=ascii
-** frontend debug output **
-*set ngdebug
-** asking after quit **
-*set askquit
-** set the number of threads in openmp
-** default (if compiled with --enable-openmp) is: 2
-set num_threads=4
-set interactive
-
-strcmp __flag $program "ngspice"
-if $__flag = 0
-
-* For SPICE2 POLYs, edit the below line to point to the location
-* of your codemodel.
-
- codemodel C:/Spice64/lib/ngspice/spice2poly.cm
-
-* The other codemodels
- codemodel C:/Spice64/lib/ngspice/analog.cm
- codemodel C:/Spice64/lib/ngspice/digital.cm
- codemodel C:/Spice64/lib/ngspice/xtradev.cm
- codemodel C:/Spice64/lib/ngspice/xtraevt.cm
- codemodel C:/Spice64/lib/ngspice/table.cm
-
-end
-unset __flag
diff --git a/visualc/spinit_orig b/visualc/spinit_orig
new file mode 100644
index 000000000..4e2ce4ea2
--- /dev/null
+++ b/visualc/spinit_orig
@@ -0,0 +1,34 @@
+* Standard ngspice init file
+alias exit quit
+alias acct rusage all
+*set rndseed=12
+** ascii rawfile **
+set filetype=ascii
+** frontend debug output **
+*set ngdebug
+** asking after quit **
+*set askquit
+** set the number of threads in openmp
+** default (if compiled with --enable-openmp) is: 2
+set num_threads=4
+
+if $?sharedmode
+  unset interactive
+  unset moremode
+else
+  set interactive
+  set x11lineararcs
+end
+
+strcmp __flag $program "ngspice"
+if $__flag = 0
+
+ codemodel ../lib/ngspice/spice2poly.cm
+ codemodel ../lib/ngspice/analog.cm
+ codemodel ../lib/ngspice/digital.cm
+ codemodel ../lib/ngspice/xtradev.cm
+ codemodel ../lib/ngspice/xtraevt.cm
+ codemodel ../lib/ngspice/table.cm
+
+end
+unset __flag
diff --git a/visualc/spinitd b/visualc/spinitd
deleted file mode 100644
index e52d0ff54..000000000
--- a/visualc/spinitd
+++ /dev/null
@@ -1,33 +0,0 @@
-* Standard ngspice init file
-alias exit quit
-alias acct rusage all
-set x11lineararcs
-*set rndseed=12
-** ascii rawfile **
-set filetype=ascii
-** frontend debug output **
-*set ngdebug
-** asking after quit **
-*set askquit
-** set the number of threads in openmp
-** default (if compiled with --enable-openmp) is: 2
-set num_threads=4
-set interactive
-
-strcmp __flag $program "ngspice"
-if $__flag = 0
-
-* For SPICE2 POLYs, edit the below line to point to the location
-* of your codemodel.
-
- codemodel C:/Spiced/lib/ngspice/spice2poly.cm
-
-* The other codemodels
- codemodel C:/Spiced/lib/ngspice/analog.cm
- codemodel C:/Spiced/lib/ngspice/digital.cm
- codemodel C:/Spiced/lib/ngspice/xtradev.cm
- codemodel C:/Spiced/lib/ngspice/xtraevt.cm
- codemodel C:/Spiced/lib/ngspice/table.cm
-
-end
-unset __flag
diff --git a/visualc/spinitd64 b/visualc/spinitd64
deleted file mode 100644
index b4a7f3ed4..000000000
--- a/visualc/spinitd64
+++ /dev/null
@@ -1,33 +0,0 @@
-* Standard ngspice init file
-alias exit quit
-alias acct rusage all
-set x11lineararcs
-*set rndseed=12
-** ascii rawfile **
-set filetype=ascii
-** frontend debug output **
-*set ngdebug
-** asking after quit **
-*set askquit
-** set the number of threads in openmp
-** default (if compiled with --enable-openmp) is: 2
-set num_threads=4
-set interactive
-
-strcmp __flag $program "ngspice"
-if $__flag = 0
-
-* For SPICE2 POLYs, edit the below line to point to the location
-* of your codemodel.
-
- codemodel C:/Spice64d/lib/ngspice/spice2poly.cm
-
-* The other codemodels
- codemodel C:/Spice64d/lib/ngspice/analog.cm
- codemodel C:/Spice64d/lib/ngspice/digital.cm
- codemodel C:/Spice64d/lib/ngspice/xtradev.cm
- codemodel C:/Spice64d/lib/ngspice/xtraevt.cm
- codemodel C:/Spice64d/lib/ngspice/table.cm
-
-end
-unset __flag