diff --git a/.clog.toml b/.clog.toml
new file mode 100644
index 0000000..2bc6ed1
--- /dev/null
+++ b/.clog.toml
@@ -0,0 +1,3 @@
+[clog]
+repository = "https://github.com/lettre/lettre"
+changelog = "CHANGELOG.md"
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..c84508a
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,77 @@
+<a name="v0.8.0"></a>
+### v0.8.0 (2018-03-31)
+
+#### Added
+
+* Support binary files as attachment
+* Move doc to a dedicated website
+* Add tests for the doc using skeptic
+* Added a code of conduct
+* Use hostname as `ClientId` when available
+
+#### Changed
+
+* Detail in SMTP Response is now an enum
+* Use nom for parsing smtp responses
+* `Envelope` was moved from `lettre_email` to `lettre`
+* `EmailAddress::new()` now returns a `Result`
+* `SendableEmail` replaces `from` and `to` by `envelope` that returns an `Envelope`
+* `File` transport storage format has changed
+
+#### Fixed
+
+* Add missing "Bcc" headers when building the email
+* Specify utf-8 charset for html
+* Use parts for text and html methods to work with attachments
+
+#### Removed
+
+* `get_ehlo` and `reset` in SmtpTransport are now private
+
+<a name="v0.7.0"></a>
+### v0.7.0 (2017-10-08)
+
+#### Added
+
+* Allow validating server certificate
+* Initial (incomplete) attachments support
+
+#### Changed
+
+* Split into the *lettre* and *lettre_email* crates
+* A lot of small improvements
+* Use *tls-native* instead of *openssl* in smtp transport
+
+<a name="v0.6.2"></a>
+### v0.6.2 (2017-02-18)
+
+#### Changed
+
+* Update env-logger crate to 0.4
+* Update openssl crate to 0.9
+* Update uuid crate to 0.4
+
+<a name="v0.6.1"></a>
+### v0.6.1 (2016-10-19)
+
+#### Changes
+
+* **documentation**
+  * #91: Build seperate docs for each release
+  * #96: Add complete documentation information to README
+
+#### Fixed
+
+* #85: Use address-list for "To", "From" etc.
+* #93: Force building tests before coverage computing
+
+<a name="v0.6.0"></a>
+### v0.6.0 (2016-05-05)
+
+#### Changes
+
+*  multipart support
+*  add non-consuming methods for Email builders
+* `add_header` does not return the builder anymore, 
+  for consistency with other methods. Use the `header`
+  method instead
diff --git a/lettre/CHANGELOG.md b/lettre/CHANGELOG.md
deleted file mode 100644
index 43df181..0000000
--- a/lettre/CHANGELOG.md
+++ /dev/null
@@ -1,51 +0,0 @@
-### v0.8.0
-
-#### Added
-
-* Move doc to a dedicated website
-* Add tests for the doc using skeptic
-* Added a code of conduct
-* Use hostname as `ClientId` when available
-
-#### Changed
-
-* Detail in SMTP Response is now an enum
-* Use nom for parsing smtp responses
-* `Envelope` was moved from `lettre_email` to `lettre`
-* `EmailAddress::new()` now returns a `Result`
-* `SendableEmail` replaces `from` and `to` by `envelope` that returns an `Envelope`
-* `File` transport storage format has changed
-
-#### Removed
-
-* `get_ehlo` and `reset` in SmtpTransport are now private
-
-### v0.7.0 (2017-10-08)
-
-#### Added
-
-* Allow validating server certificate
-
-#### Changed
-
-* Split into the *lettre* and *lettre_email* crates
-* A lot of small improvements
-* Use *tls-native* instead of *openssl* in smtp transport
-
-### v0.6.2 (2017-02-18)
-
-#### Changed
-
-* Update env-logger crate to 0.4
-* Update openssl crate to 0.9
-
-### v0.6.1 (2016-10-19)
-
-#### Changed
-
-* #91: Build seperate docs for each release
-* #96: Add complete documentation information to README
-
-#### Fixed
-
-* #93: Force building tests before coverage computing
diff --git a/lettre/CHANGELOG.md b/lettre/CHANGELOG.md
new file mode 120000
index 0000000..04c99a5
--- /dev/null
+++ b/lettre/CHANGELOG.md
@@ -0,0 +1 @@
+../CHANGELOG.md
\ No newline at end of file
diff --git a/lettre_email/CHANGELOG.md b/lettre_email/CHANGELOG.md
deleted file mode 100644
index 3ea5af0..0000000
--- a/lettre_email/CHANGELOG.md
+++ /dev/null
@@ -1,59 +0,0 @@
-### v0.8.0
-
-#### Added
-
-* Support binary files as attachment
-* Move doc to a dedicated website
-* Add tests for the doc using skeptic
-* Added a code of conduct
-
-#### Changed
-
-* `Envelope` was moved from `lettre_email` to `lettre`
-
-#### Fixed
-
-* Add missing "Bcc" headers when building the email
-* Specify utf-8 charset for html
-* Use parts for text and html methods to work with attachments
-
-### v0.7.0 (2017-10-08)
-
-#### Added
-
-* Initial (incomplete) attachments support
-
-#### Changes
-
-* Split into the *lettre* and *lettre_email* crates
-
-### v0.6.2 (2017-02-18)
-
-#### Features
-
-#### Changes
-
-* Update uuid crate to 0.4
-
-### v0.6.1 (2016-10-19)
-
-#### Changes
-
-* **documentation**
-  * #91: Build seperate docs for each release
-  * #96: Add complete documentation information to README
-
-#### Fixed
-
-* #85: Use address-list for "To", "From" etc.
-* #93: Force building tests before coverage computing
-
-### v0.6.0 (2016-05-05)
-
-#### Changes
-
-*  multipart support
-*  add non-consuming methods for Email builders
-* `add_header` does not return the builder anymore, 
-  for consistency with other methods. Use the `header`
-  method instead
diff --git a/lettre_email/CHANGELOG.md b/lettre_email/CHANGELOG.md
new file mode 120000
index 0000000..04c99a5
--- /dev/null
+++ b/lettre_email/CHANGELOG.md
@@ -0,0 +1 @@
+../CHANGELOG.md
\ No newline at end of file