diff --git a/.editorconfig b/.editorconfig
index 8c93c7aec4e5..10aaf8a9f33c 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,13 +5,11 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
 
 [{CMakeLists.txt,*.cmake}]
 indent_style = space
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
 
 [.editorconfig]
@@ -19,5 +17,4 @@ indent_style = space
 indent_size = 4
 tab_width = 4
 end_of_line = lf
-trim_trailing_whitespace = true
 insert_final_newline = true
diff --git a/ChangeLog b/ChangeLog
index 7c408458d9fe..b91a51a3f258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-06-04  Mark Lam  <mark.lam@apple.com>
+
+        Editors should not automatically trim trailing whitespace.
+        https://bugs.webkit.org/show_bug.cgi?id=212763
+
+        Reviewed by Yusuke Suzuki.
+
+        Doing so would force a lot of unnecessary code changes and make patches hard to
+        review.  It is common WebKit practice to not make unrelated changes in patches.
+
+        * .editorconfig:
+
 2020-06-02  Keith Rollin  <krollin@apple.com>
 
         Revert FEATURES_DEFINES related changes