diff --git a/.gitattributes b/.gitattributes
index 5013f4251..760ebd195 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,11 +6,14 @@
 *.lex text eol=lf
 
 # 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
+/tests export-ignore
 /utilities/ export-ignore
+
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
 /error_reporting.ini export-ignore
+/phpunit.sh export-ignore
+/phpunit.xml export-ignore
+/TODO.md export-ignore
+/travis.ini export-ignore
diff --git a/change_log.txt b/change_log.txt
index ff8f340a6..13f147a10 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,5 +1,6 @@
  - remove whitespaces after comments https://github.com/smarty-php/smarty/issues/447
  - fix foreachelse on arrayiterators https://github.com/smarty-php/smarty/issues/506
+ - fix files contained in git export archive for package maintainers https://github.com/smarty-php/smarty/issues/325
  - throw SmartyException when setting caching attributes for cacheable plugin https://github.com/smarty-php/smarty/issues/457
  - fix errors that occured where isset was replaced with null check such as https://github.com/smarty-php/smarty/issues/453
 
diff --git a/composer.json b/composer.json
index 28c392c95..889cb9444 100644
--- a/composer.json
+++ b/composer.json
@@ -40,6 +40,7 @@
         }
     },
     "require-dev": {
-        "phpunit/phpunit": "6.4.1"
+        "phpunit/phpunit": "6.4.1",
+        "smarty/smarty-lexer": "^3.1"
     }
 }