diff --git a/HISTORY.rst b/HISTORY.rst
index 2948eb05..be50d993 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,7 +4,8 @@ Release History
 2.0.3 (2015-??-??)
 ------------------
 
-* Integrate PlatformIO with `Circle CI <https://circleci.com/about>`_
+* Integrate PlatformIO with `Circle CI <https://circleci.com>`_ and
+  `Shippable CI <https://shippable.com>`_
 * Fixed resolving of C/C++ std libs by Eclipse IDE
   (`issue #220 <https://github.com/platformio/platformio/issues/220>`_)
 * Fixed "ConnectionError" when PlatformIO SF Storage is off-line
diff --git a/README.rst b/README.rst
index bd307a3c..632d91db 100644
--- a/README.rst
+++ b/README.rst
@@ -10,6 +10,9 @@ PlatformIO
 .. image:: https://circleci.com/gh/platformio/platformio/tree/develop.svg?style=svg
     :target: https://circleci.com/gh/platformio/platformio/tree/develop
     :alt: Circle.CI Build Status
+.. image:: https://api.shippable.com/projects/555b0ceeedd7f2c052f3c2d0/badge?branchName=develop
+    :target: https://app.shippable.com/projects/555b0ceeedd7f2c052f3c2d0
+    :alt: Shippable Build Status
 .. image:: https://gemnasium.com/platformio/platformio.png
     :target: https://gemnasium.com/platformio/platformio
     :alt: Dependency Status