diff --git a/.vscode/vs-code-template.code-workspace.in b/.vscode/vs-code-template.code-workspace.in
index 48cf6ddb4e0a..27f73834cf44 100644
--- a/.vscode/vs-code-template.code-workspace.in
+++ b/.vscode/vs-code-template.code-workspace.in
@@ -141,9 +141,9 @@
 		"cSpell.noSuggestDictionaries": ["ignoreWords"],
 		"cSpell.languageSettings": [
 			{
-				// check all file types, but only in comments and strings (what the regexes consider
-				// a comment/string)
-				"languageId": "*",
+				// limit spellchecking to comments and strings (what the regexes consider
+				// a comment/string) for these languages/file-types
+				"languageId": "c,objective-c,cpp,objective-cpp,makefile,m4,perl,python,automake",
 				// turn off compound words, because it is only checking strings.
 				"allowCompoundWords": false,
 				// Only check comments and strings
@@ -155,6 +155,13 @@
 				"ignoreRegExpList": [
 					"/#include.*/"
 				]
+			},
+			{
+				"languageId": "git-commit",
+				"allowCompoundWords": true,
+				"ignoreRegExpList": [
+					"/Change-Id:.*/"
+				]
 			}
 		],
 		// hide from "Problems" tab, however also makes it less visible in the editor, but there are