diff --git a/.editorconfig b/.editorconfig
index e20d15d4533..0ee9bd28ac4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -85,6 +85,12 @@ insert_final_newline = true
 indent_style = unset
 tab_width = unset
 
+[src/backend/utils/misc/postgresql.conf.sample]
+trim_trailing_whitespace = true
+insert_final_newline = true
+indent_style = space
+tab_width = unset
+
 [*.out]
 indent_style = unset
 indent_size = unset
diff --git a/.gitattributes b/.gitattributes
index 4e26bbfb145..00092168393 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,6 +19,7 @@ README.*	conflict-marker-size=48
 *.data						-whitespace
 contrib/pgcrypto/sql/pgp-armor.sql		whitespace=-blank-at-eol
 src/backend/catalog/sql_features.txt		whitespace=space-before-tab,blank-at-eof,-blank-at-eol
+src/backend/utils/misc/postgresql.conf.sample	whitespace=space-before-tab,trailing-space,tab-in-indent
 
 # Test output files that contain extra whitespace
 *.out					-whitespace