diff --git a/.gitattributes b/.gitattributes
index 8718bf4c1c397..0f06f08379a11 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,10 +2,10 @@
 *        text=auto
 
 *.cs     text diff=csharp
-*.java   text diff=java
-*.html   text diff=html
-*.css    text
-*.js     text
+*.java   text diff=java eol=lf
+*.html   text diff=html eol=lf
+*.css    text eol=lf
+*.js     text eol=lf
 *.sql    text
 
 *.csproj text merge=union
diff --git a/Rakefile b/Rakefile
index 8ea2e1bc6f3be..ea0a033bad550 100644
--- a/Rakefile
+++ b/Rakefile
@@ -274,6 +274,7 @@ task :clean do
   rm_rf 'android/libs/'
   rm_rf 'android/client/bin/'
   rm_rf 'java/client/build/'
+  rm_rf 'dist/'
   Android::Clean.new()
 end