diff --git a/.cvsignore b/.cvsignore
index 1a36453..5e004b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,7 +1,9 @@
 build
 dist
 MANIFEST
+.tox
 *.pyc
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Demo/.cvsignore b/Demo/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Demo/.cvsignore
+++ b/Demo/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Demo/Lib/.cvsignore b/Demo/Lib/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Demo/Lib/.cvsignore
+++ b/Demo/Lib/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Demo/Lib/ldap/.cvsignore b/Demo/Lib/ldap/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Demo/Lib/ldap/.cvsignore
+++ b/Demo/Lib/ldap/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Demo/Lib/ldap/async/.cvsignore b/Demo/Lib/ldap/async/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Demo/Lib/ldap/async/.cvsignore
+++ b/Demo/Lib/ldap/async/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Demo/Lib/ldapurl/.cvsignore b/Demo/Lib/ldapurl/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Demo/Lib/ldapurl/.cvsignore
+++ b/Demo/Lib/ldapurl/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Demo/Lib/ldif/.cvsignore b/Demo/Lib/ldif/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Demo/Lib/ldif/.cvsignore
+++ b/Demo/Lib/ldif/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Doc/.cvsignore b/Doc/.cvsignore
index 5557280..3b5c5ee 100644
--- a/Doc/.cvsignore
+++ b/Doc/.cvsignore
@@ -1,3 +1,4 @@
+.build
 python-ldap.pdf
 python-ldap.ps
 *.bck
diff --git a/Lib/.cvsignore b/Lib/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Lib/.cvsignore
+++ b/Lib/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Lib/ldap/.cvsignore b/Lib/ldap/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Lib/ldap/.cvsignore
+++ b/Lib/ldap/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Lib/ldap/controls/.cvsignore b/Lib/ldap/controls/.cvsignore
new file mode 100644
index 0000000..e1d0aec
--- /dev/null
+++ b/Lib/ldap/controls/.cvsignore
@@ -0,0 +1,5 @@
+*.pyc
+*.pyo
+*.bck
+*~
+*.egg-info
diff --git a/Lib/ldap/extop/.cvsignore b/Lib/ldap/extop/.cvsignore
new file mode 100644
index 0000000..e1d0aec
--- /dev/null
+++ b/Lib/ldap/extop/.cvsignore
@@ -0,0 +1,5 @@
+*.pyc
+*.pyo
+*.bck
+*~
+*.egg-info
diff --git a/Lib/ldap/schema/.cvsignore b/Lib/ldap/schema/.cvsignore
index f7c976a..e1d0aec 100644
--- a/Lib/ldap/schema/.cvsignore
+++ b/Lib/ldap/schema/.cvsignore
@@ -2,3 +2,4 @@
 *.pyo
 *.bck
 *~
+*.egg-info
diff --git a/Tests/.cvsignore b/Tests/.cvsignore
new file mode 100644
index 0000000..e1d0aec
--- /dev/null
+++ b/Tests/.cvsignore
@@ -0,0 +1,5 @@
+*.pyc
+*.pyo
+*.bck
+*~
+*.egg-info