diff --git a/src/include/.cvsignore b/src/include/.cvsignore
index 7911e9eb66..122ab4c415 100644
--- a/src/include/.cvsignore
+++ b/src/include/.cvsignore
@@ -1,5 +1,5 @@
 Makefile
 Makefile.in
-cmpi_config.h
-cmpi_config.h.in
+lam_config.h
+lam_config.h.in
 stamp-h1
diff --git a/src/lam/.cvsignore b/src/lam/.cvsignore
index e69de29bb2..2a185d9fed 100644
--- a/src/lam/.cvsignore
+++ b/src/lam/.cvsignore
@@ -0,0 +1,4 @@
+Makefile
+Makefile.in
+.libs
+*.la
diff --git a/src/lam/lfc/.cvsignore b/src/lam/lfc/.cvsignore
new file mode 100644
index 0000000000..6e5ca7ed41
--- /dev/null
+++ b/src/lam/lfc/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
diff --git a/src/lam/mem/.cvsignore b/src/lam/mem/.cvsignore
new file mode 100644
index 0000000000..6e5ca7ed41
--- /dev/null
+++ b/src/lam/mem/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
diff --git a/src/lam/os/.cvsignore b/src/lam/os/.cvsignore
new file mode 100644
index 0000000000..6e5ca7ed41
--- /dev/null
+++ b/src/lam/os/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
diff --git a/src/lam/os/irix/sn0/.cvsignore b/src/lam/os/irix/sn0/.cvsignore
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/lam/threads/.cvsignore b/src/lam/threads/.cvsignore
new file mode 100644
index 0000000000..6e5ca7ed41
--- /dev/null
+++ b/src/lam/threads/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
diff --git a/src/lam/util/.cvsignore b/src/lam/util/.cvsignore
new file mode 100644
index 0000000000..6e5ca7ed41
--- /dev/null
+++ b/src/lam/util/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.lo
+*.la
diff --git a/test/unit/lam/.cvsignore b/test/unit/lam/.cvsignore
new file mode 100644
index 0000000000..e69de29bb2