diff --git a/.gitignore b/.gitignore
index a31bf7e0091f43d4ecc8d31ec1c1bcdd25451315..1bcd0165761acdb2621bebc7f214ba01d17b163f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,6 @@
 *~
+*.#*
+*#*#
 *.swp
 *.ipr
 *.iml
@@ -16,6 +18,7 @@ third_party/libmesos.so
 third_party/libmesos.dylib
 conf/java-opts
 conf/*.sh
+conf/*.cmd
 conf/*.properties
 conf/*.conf
 conf/*.xml
diff --git a/.rat-excludes b/.rat-excludes
index 1897ec8f747ca73a08b59e92ca16296714cab424..9fc99d7fca35d5ba90a5c51c94f88aad5e087413 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -20,6 +20,7 @@ log4j.properties.template
 metrics.properties.template
 slaves
 spark-env.sh
+spark-env.cmd
 spark-env.sh.template
 log4j-defaults.properties
 bootstrap-tooltip.js