diff --git a/changelog.md b/changelog.md
new file mode 100644
index 00000000..0fb39771
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,8 @@
+# Change Log
+All enhancements and patches to cookiecutter-django will be documented in this file.
+This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2015-07-16]
+### Changed
+- Added option use maildump instead of ConsoleEmailHandler (@burhan)
+- Fixed a bug where 'DEFAULT_FROM_EMAIL' was used to cast the value (@jayfk)