diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..3946beb0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,24 @@
+/data/infra export-ignore
+/docs export-ignore
+/module/CLI/test export-ignore
+/module/CLI/test-resources export-ignore
+/module/Common/test export-ignore
+/module/Common/test-func export-ignore
+/module/Core/test export-ignore
+/module/Core/test-func export-ignore
+/module/Rest/test export-ignore
+.env.dist export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.phpstorm.meta.php export-ignore
+.scrutinizer.yml export-ignore
+.travis.yml export-ignore
+build.sh export-ignore
+CHANGELOG.md export-ignore
+docker-compose.override.yml.dist export-ignore
+docker-compose.yml export-ignore
+func_tests_bootstrap.php export-ignore
+indocker export-ignore
+phpcs.xml export-ignore
+phpunit.xml.dist export-ignore
+phpunit-func.xml export-ignore
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a698b793..006f4cc2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 ## CHANGELOG
 
+### 1.6.1
+
+* Added gitattributes file to avoid files not needed in production to be included in distribution
+
 ### 1.6.0
 
 **Features**