diff --git a/logrotate/logrotate-lib.pl b/logrotate/logrotate-lib.pl
index 38cfdc7ff..e37a8c7e8 100644
--- a/logrotate/logrotate-lib.pl
+++ b/logrotate/logrotate-lib.pl
@@ -84,7 +84,11 @@ while(<$fh>) {
 			local @dirs = sort { $a cmp $b } readdir(DIR);
 			closedir(DIR);
 			foreach $f (@dirs) {
-				next if ($f =~ /^\./ || $f =~ /\.rpmsave$/ ||
+				next if ($f =~ /^\./ ||
+					 $f =~ /\.rpm(save|orig|new)$/ ||
+					 $f =~ /\~$/ ||
+					 $f =~ /,v$/ ||
+					 $f =~ /\.swp$/ ||
 					 $f =~ /\.lock$/);
 				local ($inc, $ilnum, $ifiles) =
 					&get_config("$incfile/$f");