diff --git a/HISTORY.rst b/HISTORY.rst
index 859153b4..c5bc17b6 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -31,7 +31,7 @@ PlatformIO 3.0
 
 * Development platform `Espressif 32 <https://github.com/platformio/platform-espressif32>`__
 
-  + Added support for Simba Framework
+  + Added support for Simba & Pumbaa Frameworks
   + Added new board Node32s
   + Updated ESP32 Core for Arduino
 
diff --git a/README.rst b/README.rst
index be79d927..44a24151 100644
--- a/README.rst
+++ b/README.rst
@@ -180,6 +180,7 @@ Frameworks:
 * `ESP-IDF <http://platformio.org/frameworks/espidf>`_
 * `libOpenCM3 <http://platformio.org/frameworks/libopencm3>`_
 * `mbed <http://platformio.org/frameworks/mbed>`_
+* `Pumbaa <http://platformio.org/frameworks/pumbaa>`_
 * `Simba <http://platformio.org/frameworks/simba>`_
 * `SPL <http://platformio.org/frameworks/spl>`_
 * `WiringPi <http://platformio.org/frameworks/wiringpi>`_
diff --git a/docs b/docs
index f4feb770..30877574 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit f4feb7709843a5a05912128bd872ab5ec8df0992
+Subproject commit 308775747a663039b5210d94f05431b32f7114ae
diff --git a/examples b/examples
index fa891378..d32be42b 160000
--- a/examples
+++ b/examples
@@ -1 +1 @@
-Subproject commit fa891378955708aec4d6a0c24bfa5ed9bb0a0dc4
+Subproject commit d32be42b60e88f209d008e5d1578be7b0c823ce9