diff --git a/ArduinoJson.h b/ArduinoJson.h
index 6b176c8c..f982325c 100644
--- a/ArduinoJson.h
+++ b/ArduinoJson.h
@@ -6,9 +6,8 @@
 
 // About this file
 // ---------------
-// This file is here to please the platform.io compile. It must be present in
-// the root for the IDE to find it. Feel free to ignore this file if your
-// working in another environment.
-// ...and yes this is driving me crazy!
+// This file is here for [PlatformIO](http://platformio.org/).
+// It must be present in the root for the tool to find it.
+// Feel free to ignore this file if your working in another environment.
 
 #include "include/ArduinoJson.h"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4aea3f5f..b796eaf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ ArduinoJson: change log
 HEAD
 ----
 
-* Made the library compatible with platform.io (issue #181)
+* Made the library compatible with [PlatformIO](http://platformio.org/) (issue #181)
 
 v5.0.7
 ------
diff --git a/README.md b/README.md
index 8c68622e..3d1dee1f 100644
--- a/README.md
+++ b/README.md
@@ -27,8 +27,13 @@ Works on
 * All Arduino boards
 * ESP8266
 * Teensy
+* Intel Edison
+* PlatformIO
+* Energia
 * Computers (Windows, Linux, OSX...)
 
+See [FAQ: Compatibility issues](https://github.com/bblanchon/ArduinoJson/wiki/Compatibility-issues)
+
 Quick start
 -----------