diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14e82af8..b9673cd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,8 @@
 ArduinoJson: change log
 =======================
 
-HEAD
-----
+v5.8.4
+------
 
 * Added custom implementation of `strtod()` (issue #453)
 * Added custom implementation of `strtol()` (issue #465)
diff --git a/README.md b/README.md
index e144f0b7..fa682372 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,6 @@ Works on
 * RedBearLab boards (BLE Nano...)
 * Computers (Windows, Linux, OSX...)
 
-See [FAQ: Compatibility issues](https://bblanchon.github.io/ArduinoJson/faq/compilation-fails-device-crashes-nothing-on-serial-console)
-
 Quick start
 -----------
 
diff --git a/appveyor.yml b/appveyor.yml
index ed98fb0e..73928d95 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 5.8.3.{build}
+version: 5.8.4.{build}
 environment:
   matrix:
   - CMAKE_GENERATOR: Visual Studio 14 2015
diff --git a/library.json b/library.json
index 3d6b47b8..1e8adfe2 100644
--- a/library.json
+++ b/library.json
@@ -6,7 +6,7 @@
     "type": "git",
     "url": "https://github.com/bblanchon/ArduinoJson.git"
   },
-  "version": "5.8.3",
+  "version": "5.8.4",
   "authors": {
     "name": "Benoit Blanchon",
     "url": "https://blog.benoitblanchon.fr"
diff --git a/library.properties b/library.properties
index 8f1e649a..ac76eff3 100644
--- a/library.properties
+++ b/library.properties
@@ -1,9 +1,9 @@
 name=ArduinoJson
-version=5.8.3
+version=5.8.4
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=An efficient and elegant JSON library for Arduino.
 paragraph=Like this project? Please star it on GitHub!
 category=Data Processing
-url=https://github.com/bblanchon/ArduinoJson
+url=https://bblanchon.github.io/ArduinoJson/
 architectures=*