diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..eab01fc
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+*.txt eol=lf
+*#txt eol=lf
+*.sh eol=lf
diff --git a/.gitignore b/.gitignore
index 7034578..9915552 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /*/target/
 /target/
 core/src/main/java/com/threerings/getdown/data/Build.java
+*.iml