diff --git a/.gitattributes b/.gitattributes
index 3cbdf4105..4e8e8de0f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,9 +1,15 @@
 * text=auto
-*.bat -text
-*.vcproj -text
-*.nsi -text
-*.sln -text
-*.vbs -text
+*.bat eol=crlf
+*.vcproj eol=crlf
+*.nsi eol=crlf
+*.sln eol=crlf
+*.vbs eol=crlf
+
+*.txt eol=crlf
+CMake*.txt eol=lf
+version.txt eol=lf
+VERSION.txt eol=lf
+robots.txt eol=lf
 
 *.ttc -text -diff
 *.ttf -text -diff
@@ -27,6 +33,8 @@
 *.xcf -text -diff
 *.blend -text -diff
 *.blend1 -text -diff
-.gitattributes export-ignore  
+
+.git export-ignore
 .gitignore export-ignore
+.gitattributes export-ignore
 .gitmodules export-ignore
diff --git a/.gitignore b/.gitignore
index 806a1ac89..49db33198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,12 +6,8 @@
 # Vim
 *.un~
 Session.vim
-MegaGlest.kdev4
-/mk/linux/mydata
-/mk/linux/release
-/mk/linux/linux_symbols
-/mk/linux/core
-/mk/linux/core.bak
+# KDevelop
+*.kdev4
 
 ## OSX
 Icon
@@ -55,10 +51,9 @@ $RECYCLE.BIN/
 ## Repo
 *.blend
 *.blend1
-# Linux_build
-/mk/linux/build/
-/google-breakpad
-/mk/linux/megaglest.6
+
+/google-breakpad/
+
 # Windows_build
 *.dll
 *.exe
@@ -68,13 +63,11 @@ $RECYCLE.BIN/
 *.map
 *.dmp
 *.dat
-/data/glest_game/lua/
+#/data/glest_game/lua/
 #
 
-/source/windows_deps_2012
-/source/windows_deps_2010
-/source/windows_deps_2010_old
-
 # Coverity
-/cov-int
-/cov-int/.*
+/cov-int/
+
+# convert_faction_xml2html
+/html/
diff --git a/mk/linux/.gitignore b/mk/linux/.gitignore
index ed6fd7abf..0739741cc 100644
--- a/mk/linux/.gitignore
+++ b/mk/linux/.gitignore
@@ -1,2 +1,13 @@
 megaglest
+megaglest.6
+
 megaglest_*
+!*.desktop
+
+core
+core.bak
+
+/build/
+/release/
+/linux_symbols/
+/mydata
diff --git a/mk/windoze/.gitignore b/mk/windoze/.gitignore
index 1da00c98d..5ab276c9d 100644
--- a/mk/windoze/.gitignore
+++ b/mk/windoze/.gitignore
@@ -1,3 +1,3 @@
-Release/
+/Release/
 
 /ipch
diff --git a/source/.gitignore b/source/.gitignore
index 169b5d818..0f1f98e93 100644
--- a/source/.gitignore
+++ b/source/.gitignore
@@ -1 +1 @@
-windows_deps/
+/windows_deps*/