diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08134e0..70d553b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,10 +1,40 @@
 # Changelog
 
-## Unreleased
+## 0.4.0
 
-* change default case conversions for generated files (#196)
-* enum type safety (#205)
-* postgress geography type support (#232)
+### BREAKING CHANGES
+
+* Custom NamingStrategy is now defined as separate functions instead of a class
+* Rework how parameters are passed to the library:
+    - Utilization of partial config files
+    - Option to save .tomg-config file without connection options
+* Generation of separate fields for primary columns which are used in relations(old approach won't be compatible with typeorm@0.3.0)
+* Remove timeout parameter - query timeout is now set by default to 1 hr
+* Change default case conversions for generated files (#196)
+
+### FIXES
+* Support complex relationships (#117)
+* Proper support for many to many relations
+* Proper pluralization of entity names (#142)
+* Skip generation of imports not used by entity definition files
+* Skip generation of indices generated by PKs or relations
+* Columns with unrecognized sql type are generated with unknown type
+* Generation of proper type for nullable columns
+* Fixed specifying custom naming strategy by relative path (#171)
+* Disallow generation of relationId fields with lazy relations(not supported in typeorm)
+
+### ENHANCEMENTS
+* Support for old oracle versions (#195) 
+* New options:
+    * Disable column name pluralization (#142)
+    * Ignore tables parameter (#120)
+    * Generation of index file (#174)
+    * Default exports on generated models
+* Enum type safety (#205)
+* Mysql set type support (#91)
+* Postgres geography type support (#232)
+* Make generated models compatible with common ESLint rules
+* Ability to use typeorm-model-generator as library in other projects (but no guarantees about api compatibility between different version)
 
 ## 0.3.5