diff --git a/.clang-format b/.clang-format
index dd4ade370..96ba5909f 100644
--- a/.clang-format
+++ b/.clang-format
@@ -15,7 +15,7 @@ AlignConsecutiveAssignments: false
 AlignConsecutiveDeclarations: false
 AlignEscapedNewlines: Left # Unknown to clang-format-4.0
 AlignOperands: true
-AlignTrailingComments: false
+AlignTrailingComments: true
 AlignConsecutiveMacros: true
 AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: false
diff --git a/scripts/fetch-clang-format.sh b/scripts/fetch-clang-format.sh
index c9006c518..0e9545f2d 100755
--- a/scripts/fetch-clang-format.sh
+++ b/scripts/fetch-clang-format.sh
@@ -12,4 +12,5 @@ curl -s "${URL}" | sed -e "
 	s,Intended for clang-format >= 4,Intended for clang-format >= 11,g;
 	s,ForEachMacros:,ForEachMacros:\n  - 'for_each_pstree_item',g;
 	s,\(AlignTrailingComments:.*\)$,\1\nAlignConsecutiveMacros: true,g;
+	s,AlignTrailingComments: false,AlignTrailingComments: true,g;
 "  > .clang-format