diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b41ad91..2fc98dc0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
 CHANGELOG
 =========
 
+# 1.4.0 / 2017-10-30
+
+* [FEATURE] Allow specifying custom repo. See [#80][]
+* [FEATURE] Add Agent6 (beta) support on debianoids. See [#81][]
+* [BUGFIX] Fix incorrect handler name in process task. See [#68][] (thanks [@jeffwidman][])
+* [SANITY] Improve agent service task name and handler formatting. See [#62][] and [#67][] (thanks [@jeffwidman][])
+
 # 1.3.0 / 2017-04-04
 
 * [FEATURE] Add support for configuring trace agent. See [#45][] and [#58][] (thanks [@pmbauer][])
@@ -34,6 +41,11 @@ Initial release, compatible with Ansible v1 & v2
 [#58]: https://github.com/DataDog/ansible-datadog/issues/58
 [#59]: https://github.com/DataDog/ansible-datadog/issues/59
 [#61]: https://github.com/DataDog/ansible-datadog/issues/61
+[#62]: https://github.com/DataDog/ansible-datadog/issues/62
+[#67]: https://github.com/DataDog/ansible-datadog/issues/67
+[#68]: https://github.com/DataDog/ansible-datadog/issues/68
+[#80]: https://github.com/DataDog/ansible-datadog/issues/80
+[#81]: https://github.com/DataDog/ansible-datadog/issues/81
 [@eplanet]: https://github.com/eplanet
 [@geoffwright]: https://github.com/geoffwright
 [@gtrummell]: https://github.com/gtrummell
diff --git a/README.md b/README.md
index 1baf4c07..dda539c5 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,10 @@ Role Variables
 Agent 6 (beta)
 --------------
 
+This role includes experimental support of the beta versions of Datadog Agent 6.0 on apt-based platforms.
+See below for usage. General information on the Datadog Agent 6 is available in the
+[datadog-agent](https://github.com/DataDog/datadog-agent/) repo.
+
 To upgrade or install agent6, you need to:
 
 - set `datadog_agent6` to true
@@ -56,7 +60,7 @@ None
 
 Example Playbooks
 -------------------------
-```
+```yml
 - hosts: servers
   roles:
     - { role: Datadog.datadog, become: yes }  # On Ansible < 1.9, use `sudo: yes` instead of `become: yes`
@@ -104,12 +108,33 @@ Example Playbooks
               - instance:bar
 ```
 
-```
+```yml
 - hosts: servers
   roles:
     - { role: Datadog.datadog, become: yes, datadog_api_key: "mykey" }  # On Ansible < 1.9, use `sudo: yes` instead of `become: yes`
 ```
 
+Known Issues and Workarounds
+----------------------------
+
+On Debian Stretch, the `apt_key` module that the role uses requires an additional system dependency to work correctly.
+Unfortunately that dependency (`dirmngr`) is not provided by the module. To work around this, you can add the following
+to the playbooks that make use of the present role:
+
+```yml
+---
+- hosts: all
+  pre_tasks:
+    - name: Debian Stretch requires dirmngr package to be installed in order to use apt_key
+      become: yes  # On Ansible < 1.9, use `sudo: yes` instead of `become: yes`
+      apt:
+        name: dirmngr
+        state: present
+
+  roles:
+    - { role: Datadog.datadog, become: yes, datadog_api_key: "mykey" }  # On Ansible < 1.9, use `sudo: yes` instead of `become: yes`
+```
+
 License
 -------