diff --git a/CheckFilelist.py b/CheckFilelist.py
index d3f26ae..1e74d89 100644
--- a/CheckFilelist.py
+++ b/CheckFilelist.py
@@ -135,10 +135,11 @@ _checks = [
         },
         {
             'error': 'suse-filelist-forbidden-backup-file',
-            'details': 'backup files (e.g. files ending in ~ or .bak) are not allowed',
+            'details': 'backup files (e.g. files ending in ~, .swp or .bak) are not allowed',
             'bad': [
                 '*~',
                 '*.bak',
+                '*.swp',
                 ],
             'ignorefileif': ghostfile,
             },
diff --git a/rpmlint.changes b/rpmlint.changes
index ccd5139..ef69485 100644
--- a/rpmlint.changes
+++ b/rpmlint.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Mar 13 15:14:07 CET 2012 - dmueller@suse.de
+
+- block .swp files as well (they are usually vi(m) backup files) 
+
 -------------------------------------------------------------------
 Wed Feb 29 13:49:51 UTC 2012 - lnussel@suse.de