diff --git a/files-with-type b/files-with-type
index 0c7dcbb09..771380ada 100755
--- a/files-with-type
+++ b/files-with-type
@@ -10,4 +10,4 @@
 mime_type=$1
 shift
 
-git ls-files | grep -vE '^vendor/' | xargs file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//'
+git ls-files "$@" | grep -vE '^vendor/' | xargs file --mime-type | grep "${mime_type}" | sed -e 's/:.*$//'
diff --git a/lint b/lint
index eeca6653f..994d4c321 100755
--- a/lint
+++ b/lint
@@ -166,7 +166,7 @@ function lint_files {
 
 function list_files {
 	if [ $# -gt 0 ]; then
-        git ls-files --exclude-standard | grep -v '^vendor/'
+        git ls-files --exclude-standard | grep -vE '(^|/)vendor/'
 	else
 		git diff --cached --name-only
 	fi