diff --git a/.gitignore b/.gitignore
index 6753368301..960c29e4ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.orig
 *.rej
 *~
+*.swp
 *.o
 *.d
 *.opic
diff --git a/.hgignore b/.hgignore
index 6b432f7c25..f3877a9f78 100644
--- a/.hgignore
+++ b/.hgignore
@@ -11,6 +11,7 @@
 .*\.tar\.bz2$
 .*\.tar\.gz$
 .*~$
+.*\.swp$
 .*\.tmp$
 .*\.flc$
 .*\.orig$