diff --git a/src/xspice/.cvsignore b/src/xspice/.cvsignore
new file mode 100644
index 000000000..d436efd0f
--- /dev/null
+++ b/src/xspice/.cvsignore
@@ -0,0 +1,3 @@
+Makefile.in
+Makefile
+
diff --git a/src/xspice/cm/.cvsignore b/src/xspice/cm/.cvsignore
new file mode 100644
index 000000000..12a135193
--- /dev/null
+++ b/src/xspice/cm/.cvsignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+.deps
+
diff --git a/src/xspice/cmpp/.cvsignore b/src/xspice/cmpp/.cvsignore
index 56de9c2b9..e2ecce563 100755
--- a/src/xspice/cmpp/.cvsignore
+++ b/src/xspice/cmpp/.cvsignore
@@ -9,3 +9,4 @@ ifs_yacc.c
 ifs_yacc.h
 ifs_lex.c
 cmpp.exe
+cmpp
diff --git a/src/xspice/cmpp/mod_yacc.y b/src/xspice/cmpp/mod_yacc.y
index 05e3b14c3..b7ea9836c 100755
--- a/src/xspice/cmpp/mod_yacc.y
+++ b/src/xspice/cmpp/mod_yacc.y
@@ -19,6 +19,8 @@ AUTHORS
 MODIFICATIONS
 
     <date> <person name> <nature of modifications>
+  20050420 Steven Borley Renamed strcmpi() to local_strcmpi() to avoid
+                         clash with strcmpi() in a windows header file.
 
 SUMMARY
 
diff --git a/src/xspice/enh/.cvsignore b/src/xspice/enh/.cvsignore
new file mode 100644
index 000000000..12a135193
--- /dev/null
+++ b/src/xspice/enh/.cvsignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+.deps
+
diff --git a/src/xspice/evt/.cvsignore b/src/xspice/evt/.cvsignore
new file mode 100644
index 000000000..12a135193
--- /dev/null
+++ b/src/xspice/evt/.cvsignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+.deps
+
diff --git a/src/xspice/icm/.cvsignore b/src/xspice/icm/.cvsignore
new file mode 100644
index 000000000..55e12c09a
--- /dev/null
+++ b/src/xspice/icm/.cvsignore
@@ -0,0 +1,2 @@
+makedefs
+.deps
diff --git a/src/xspice/icm/README b/src/xspice/icm/README
index a969bb159..ab42367eb 100644
--- a/src/xspice/icm/README
+++ b/src/xspice/icm/README
@@ -31,7 +31,7 @@ and does "make".)
 
 6.  Read the codemodel into ngspice in the following way:
 
-ngspice 1 -> codemodel /usr/local/src/tclspice-0.2.10/src/xspice/icm/spice2poly.cm
+ngspice 1 -> codemodel /usr/local/lib/spice/spice2poly.cm
 
 (Of course, you should point to the location where *you* built
 spice2poly.cm!)  You might want to put this invocation into your
diff --git a/src/xspice/idn/.cvsignore b/src/xspice/idn/.cvsignore
new file mode 100644
index 000000000..12a135193
--- /dev/null
+++ b/src/xspice/idn/.cvsignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+.deps
+
diff --git a/src/xspice/ipc/.cvsignore b/src/xspice/ipc/.cvsignore
new file mode 100644
index 000000000..12a135193
--- /dev/null
+++ b/src/xspice/ipc/.cvsignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+.deps
+
diff --git a/src/xspice/mif/.cvsignore b/src/xspice/mif/.cvsignore
new file mode 100644
index 000000000..12a135193
--- /dev/null
+++ b/src/xspice/mif/.cvsignore
@@ -0,0 +1,4 @@
+Makefile.in
+Makefile
+.deps
+