diff --git a/.clang-format b/.clang-format
index b64ade9d9..475638015 100644
--- a/.clang-format
+++ b/.clang-format
@@ -516,6 +516,7 @@ IncludeCategories:
     Priority: 1
 IncludeIsMainRegex: '(Test)?$'
 IndentCaseLabels: false
+IndentGotoLabels: false
 IndentPPDirectives: None # Unknown to clang-format-5.0
 IndentWidth: 8
 IndentWrappedFunctionNames: false
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
index b93a804a1..b80175f05 100755
--- a/scripts/fetch-clang-format.sh
+++ b/scripts/fetch-clang-format.sh
@@ -14,4 +14,5 @@ curl -s "${URL}" | sed -e "
 	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_pstree_item',g;
 	s,\(AlignTrailingComments:.*\)$,\1\nAlignConsecutiveMacros: true,g;
 	s,AlignTrailingComments: false,AlignTrailingComments: true,g;
+	s,\(IndentCaseLabels: false\),\1\nIndentGotoLabels: false,g;
 "  > .clang-format