diff --git a/.cvsignore b/.cvsignore
index 0ca4097f1..7554d7a20 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,8 +1,11 @@
 config.inc.php
+config.header.inc.php
+config.footer.inc.php
 phpmyadmin.wpj
+*.swp
 upload
 save
 .htaccess
 .vimrc
 .project
-.settings
\ No newline at end of file
+.settings
diff --git a/ChangeLog b/ChangeLog
index c37569aba..02b6dc70a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ $Source$
       Header and footer per themes (RFE #984152),
       config.{header,footer}.inc.php files are now optional.
     * libraries/select_lang.lib.php: Fix undefined indexes.
+    * */.cvsignore: Ignore custom headers and temporary files from Vim.
 
 2005-11-24 Marc Delisle  <lem9@users.sourceforge.net>
     * js/querywindow.js: bug #1365503, "do not overwrite this query"
diff --git a/css/.cvsignore b/css/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/css/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/js/.cvsignore b/js/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/js/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/lang/.cvsignore b/lang/.cvsignore
index 2d10b25d9..e6c1258e5 100644
--- a/lang/.cvsignore
+++ b/lang/.cvsignore
@@ -1,2 +1,3 @@
 tmp-check
 added_messages.php
+*.swp
diff --git a/libraries/.cvsignore b/libraries/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/auth/.cvsignore b/libraries/auth/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/auth/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/dbg/.cvsignore b/libraries/dbg/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/dbg/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/dbi/.cvsignore b/libraries/dbi/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/dbi/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/engines/.cvsignore b/libraries/engines/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/engines/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/export/.cvsignore b/libraries/export/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/export/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/fpdf/.cvsignore b/libraries/fpdf/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/fpdf/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/fpdf/font/.cvsignore b/libraries/fpdf/font/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/fpdf/font/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/import/.cvsignore b/libraries/import/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/import/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/libraries/transformations/.cvsignore b/libraries/transformations/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/libraries/transformations/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/scripts/.cvsignore b/scripts/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/scripts/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/test/.cvsignore b/test/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/test/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/themes/.cvsignore b/themes/.cvsignore
index bf64baeb7..1af11c8ee 100644
--- a/themes/.cvsignore
+++ b/themes/.cvsignore
@@ -15,4 +15,4 @@ openphpnuke
 paradice
 xampp
 xp_basic
-xp_blue
\ No newline at end of file
+xp_blue*.swp
diff --git a/themes/darkblue_orange/.cvsignore b/themes/darkblue_orange/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/themes/darkblue_orange/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/themes/darkblue_orange/css/.cvsignore b/themes/darkblue_orange/css/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/themes/darkblue_orange/css/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/themes/darkblue_orange/img/.cvsignore b/themes/darkblue_orange/img/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/themes/darkblue_orange/img/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/themes/original/.cvsignore b/themes/original/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/themes/original/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/themes/original/css/.cvsignore b/themes/original/css/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/themes/original/css/.cvsignore
@@ -0,0 +1 @@
+*.swp
diff --git a/themes/original/img/.cvsignore b/themes/original/img/.cvsignore
new file mode 100644
index 000000000..1377554eb
--- /dev/null
+++ b/themes/original/img/.cvsignore
@@ -0,0 +1 @@
+*.swp