diff --git a/bootleg-stow b/bootleg-stow
index f5e4f067..7d686e63 100755
--- a/bootleg-stow
+++ b/bootleg-stow
@@ -75,7 +75,7 @@ checkconflict() {
 		error "Could not read directory: $1" 2
 	fi
 	# Get our list of files
-	local files="$(find "$1" -type f -o -type l)"
+	local files="$(find "$1" ! -name "*.swp" -type f -o -type l)"
 	local directories="$(find "$1" -type d)"
 	local -a conflict
 	# Iterate over them