diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000000..fcadb2cf9791
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text eol=lf
diff --git a/build.gradle b/build.gradle
index eeba690d99a8..743f19da89e4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -96,6 +96,7 @@ allprojects {
 			eclipseFormatFile rootProject.file('src/eclipse/junit-eclipse-formatter-settings.xml')
 
 			trimTrailingWhitespace()
+			lineEndings 'UNIX'
 			endWithNewline()
 
 			custom 'Lambda fix', { it.replace('} )', '})').replace('} ,', '},') }
@@ -395,11 +396,13 @@ configure(rootProject) {
 			target '**/*.gradle', '**/*.gitignore'
 			indentWithTabs()
 			trimTrailingWhitespace()
+			lineEndings 'UNIX'
 			endWithNewline()
 		}
 		format 'documentation', {
 			target '**/*.adoc', '**/*.md'
 			trimTrailingWhitespace()
+			lineEndings 'UNIX'
 			endWithNewline()
 		}
 	}