diff --git a/.travis.yml b/.travis.yml
index b206d1451..e904d8af8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,9 @@ install:
 before_script:
   - avr-gcc --version
 script:
-- make $TARGET AUTOGEN=$AUTOGEN
+- 'if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
+make $TARGET AUTOGEN=$AUTOGEN
+fi'
 addons:
   apt:
     packages:
diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 9f23db972..f12da913c 100644
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -26,21 +26,25 @@ else
 	echo "No essential files modified."
 fi
 
-make ergodox-ez AUTOGEN=true
+if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 
-find . -name ".build" | xargs rm -rf
-cd ..
-git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
-cd qmk.fm
-git submodule update --init --recursive
-rm -rf keyboard
-rm -rf keyboards
-cp -r ../qmk_firmware/keyboards .
-mkdir keyboards/ergodox_ez/
-cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
-cp ../qmk_firmware/readme.md qmk_readme.md
-./generate.sh
+	make ergodox-ez AUTOGEN=true
 
-git add -A
-git commit -m "generated from qmk/qmk_firmware@${rev}" 
-git push
+	find . -name ".build" | xargs rm -rf
+	cd ..
+	git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git
+	cd qmk.fm
+	git submodule update --init --recursive
+	rm -rf keyboard
+	rm -rf keyboards
+	cp -r ../qmk_firmware/keyboards .
+	mkdir keyboards/ergodox_ez/
+	cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
+	cp ../qmk_firmware/readme.md qmk_readme.md
+	./generate.sh
+
+	git add -A
+	git commit -m "generated from qmk/qmk_firmware@${rev}" 
+	git push
+
+fi
\ No newline at end of file