diff --git a/.clang-format b/.clang-format
index 1da4f35d..2880be88 100644
--- a/.clang-format
+++ b/.clang-format
@@ -22,6 +22,8 @@ BinPackArguments: false
 BinPackParameters: false
 AllowAllArgumentsOnNextLine: false
 AllowShortFunctionsOnASingleLine: Empty
+# TODO with Clang 19, replace the below with
+# BreakAfterReturnType: ExceptShortType
 AlwaysBreakAfterReturnType: AllDefinitions
 AlignEscapedNewlines: Left
 ForEachMacros: ['ssh_callbacks_iterate']