diff --git a/.gitignore b/.gitignore
index 6367ebf778..99dc87c948 100644
--- a/.gitignore
+++ b/.gitignore
@@ -60,3 +60,4 @@ cscope.*
 *.tar.gz
 *.patch
 *.orig
+*.log
diff --git a/Makefile.am b/Makefile.am
index 43891af710..02e1044348 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,7 +75,7 @@ install-data-hook:
 	ln -fs zfs.release spl.release
 endif
 
-codecheck: cstyle shellcheck flake8 mancheck testscheck
+codecheck: cstyle shellcheck flake8 mancheck testscheck vcscheck
 
 checkstyle: codecheck commitcheck
 
@@ -117,6 +117,12 @@ testscheck:
 		xargs -r stat -c '%A %n' | \
 		awk '{c++; print} END {if(c>0) exit 1}'
 
+vcscheck:
+	@if git rev-parse --git-dir > /dev/null 2>&1; then \
+		git ls-files . --exclude-standard --others | \
+		awk '{c++; print} END {if(c>0) exit 1}' ; \
+	fi
+
 lint: cppcheck paxcheck
 
 cppcheck: