diff --git a/Compatibility-issues.md b/Compatibility-issues.md
index 33d42b0..e5d1370 100644
--- a/Compatibility-issues.md
+++ b/Compatibility-issues.md
@@ -43,6 +43,23 @@ On Windows, the file is likely to be located here:
 
 See issues [#123](https://github.com/bblanchon/ArduinoJson/issues/123) and [#138](https://github.com/bblanchon/ArduinoJson/issues/138)
 
+## Intel Galileo: compilation error
+
+This is a known bug in [Arduino core for Intel Galileo](https://github.com/01org/corelibs-galileo).
+A [pull request](https://github.com/01org/corelibs-galileo/pull/29) has been submitted but is still waiting for approval.
+
+Until this gets fixed, just insert the following line in your local `cores/arduino/WString.h`:
+
+    const char * c_str() const { return buffer; }
+
+On Windows, the file is likely to be located here:
+
+```
+%LOCALAPPDATA%\Arduino15\packages\Intel\hardware\i686\1.6.2+1.0\cores\arduino\WString.h
+```
+
+See issue [#299](https://github.com/bblanchon/ArduinoJson/issues/299).
+
 ## RedBearLab boards: compilation error
 
 This is a known bug in [Arduino core for BLE Nano](https://github.com/RedBearLab/nRF51822-Arduino).