diff --git a/.gitattributes b/.gitattributes
index 0a4d0346..4d3c3d8c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,11 @@
-* text=auto !eol
-docs/chm/make_chm_spc.gif -text
-docs/fop/thryb.ttf -text
-docs/fop/thrybi.ttf -text
-docs/fop/thryi.ttf -text
-docs/fop/thryn.ttf -text
-misc/smarty_icon.gif -text
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# exclude from git export
+/travis.ini export-ignore
+/myconfig.ini export-ignore
+/.travis.yml export-ignore
+/.gitignore export-ignore
+/.gitattributes export-ignore
+/lexer/ export-ignore
+/utilities/ export-ignore
diff --git a/.gitignore b/.gitignore
index 8ebfb9f2..b78ac2f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,19 +1,9 @@
-docs/*.cache
-docs/*.fot
-docs/Makefile
-docs/chm/*.chm
-docs/chm/*.hh?
-docs/chm/fancy
-docs/config.*
-docs/configure
-docs/diff
-docs/dsssl/html-common.dsl
-docs/entities/file-entities.ent
-docs/entities/version.ent
-docs/html
-docs/manual.pdf
-docs/manual.xml
-docs/phpweb
-docs/revcheck.html
-docs/scripts/file-entities.php
-/templates_c
+
+.idea/
+# Smarty
+lexer/*.php
+lexer/*.php.bak
+lexer/*.out
+utilies/*.php
+/composer.lock
+/vendor