diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..fddb8adb39
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Normalize line endings to LF.
+* text eol=lf
+
+# Ensure that line endings for multipart files in spring-web are not modified.
+*.multipart -text
diff --git a/spring-web/src/test/resources/org/springframework/http/codec/multipart/.gitattributes b/spring-web/src/test/resources/org/springframework/http/codec/multipart/.gitattributes
deleted file mode 100644
index 3a5e514d9b..0000000000
--- a/spring-web/src/test/resources/org/springframework/http/codec/multipart/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-*.multipart     -text