diff --git a/util/travis_build.sh b/util/travis_build.sh
index 80d843bfc1f..3243447ab62 100644
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -14,9 +14,19 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	else
 		MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)(?=\/)' | sort -u)
 		for KB in $MKB ; do
-			echo "Making all keymaps for $KB"
-			make ${KB}-allsp-allkm AUTOGEN=true
-			: $((exit_code = $exit_code + $?))
+			KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l)
+			if [[ $KEYMAP_ONLY -gt 0 ]]; then
+				echo "Making all keymaps for $KB"
+				make ${KB}-allsp-allkm AUTOGEN=true
+				: $((exit_code = $exit_code + $?))
+			else
+				MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u)
+				for KM in $MKM ; do
+					echo "Making $KM for $KB"	
+					make ${KB}-allsp-${KM} AUTOGEN=true
+					: $((exit_code = $exit_code + $?))
+				done		
+			fi
 		done
 	fi
 	exit $exit_code