diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000000..7d07d70cc8d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=lf
diff --git a/collect_app/config/checkstyle/checkstyle.xml b/collect_app/config/checkstyle/checkstyle.xml
index c8eaeb53225..b6e307ac95f 100644
--- a/collect_app/config/checkstyle/checkstyle.xml
+++ b/collect_app/config/checkstyle/checkstyle.xml
@@ -19,6 +19,12 @@
         <property name="eachLine" value="true" />
     </module>
 
+    <!-- ODK-specific additions -->
+    <module name="RegexpMultiline">
+        <property name="format" value="\r\n"/>
+        <property name="message" value="Do not use Windows line endings"/>
+    </module>
+
     <module name="TreeWalker">
         <!-- ODK-specific additions -->
         <module name="IllegalImport" />