diff --git a/common/travis/changed_templates.sh b/common/travis/changed_templates.sh
index d6a66107bf3..6b27ad8227f 100755
--- a/common/travis/changed_templates.sh
+++ b/common/travis/changed_templates.sh
@@ -9,7 +9,9 @@ elif command -v git >/dev/null 2>&1; then
 fi
 
 /bin/echo -e '\x1b[32mChanged packages:\x1b[0m'
-$GIT_CMD diff-tree -r --no-renames --name-only --diff-filter=AM FETCH_HEAD HEAD -- 'srcpkgs/*/template' |
+$GIT_CMD diff-tree -r --no-renames --name-only --diff-filter=AM \
+	"$(git merge-base FETCH_HEAD HEAD)" HEAD \
+	-- 'srcpkgs/*/template' |
 	cut -d/ -f 2 |
 	tee /tmp/templates |
 	sed "s/^/  /" >&2