diff --git a/HISTORY.rst b/HISTORY.rst
index 75e475ba..1e4480cf 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -9,6 +9,10 @@ PlatformIO 2.0
 
 * Added support for ubIQio Ardhat board
   (`pull #302 <https://github.com/platformio/platformio/pull/302>`_)
+* Fixed missing of `framework-mbed <http://docs.platformio.org/en/latest/frameworks/mbed.html>`_
+  package for `teensy <http://docs.platformio.org/en/latest/platforms/teensy.html>`_
+  platform
+  (`issue #305 <https://github.com/platformio/platformio/issues/305>`_)
 
 2.3.3 (2015-10-02)
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/frameworks/mbed.rst b/docs/frameworks/mbed.rst
index 1d54bc9d..0d4fa0cf 100644
--- a/docs/frameworks/mbed.rst
+++ b/docs/frameworks/mbed.rst
@@ -31,6 +31,9 @@ Platforms
     * - :ref:`platform_ststm32`
       - The STM32 family of 32-bit Flash MCUs based on the ARM Cortex-M processor is designed to offer new degrees of freedom to MCU users. It offers a 32-bit product range that combines very high performance, real-time capabilities, digital signal processing, and low-power, low-voltage operation, while maintaining full integration and ease of development.
 
+    * - :ref:`platform_teensy`
+      - Teensy is a complete USB-based microcontroller development system, in a very small footprint, capable of implementing many types of projects. All programming is done via the USB port. No special programmer is needed, only a standard "Mini-B" USB cable and a PC or Macintosh with a USB port.
+
 Boards
 ------
 
diff --git a/docs/platforms/teensy.rst b/docs/platforms/teensy.rst
index 29dbc2b0..02e0c732 100644
--- a/docs/platforms/teensy.rst
+++ b/docs/platforms/teensy.rst
@@ -17,21 +17,24 @@ Packages
     * - Name
       - Contents
 
+    * - ``framework-arduinoteensy``
+      - `Arduino Wiring-based Framework <http://arduino.cc/en/Reference/HomePage>`_
+
+    * - ``tool-teensy``
+      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
+
+    * - ``toolchain-gccarmnoneeabi``
+      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
+
+    * - ``framework-mbed``
+      - `mbed Framework <http://mbed.org>`_
+
     * - ``toolchain-atmelavr``
       - `avr-gcc <https://gcc.gnu.org/wiki/avr-gcc>`_, `GDB <http://www.gnu.org/software/gdb/>`_, `AVaRICE <http://avarice.sourceforge.net/>`_, `SimulAVR <http://www.nongnu.org/simulavr/>`_
 
     * - ``ldscripts``
       - `Linker Scripts <https://sourceware.org/binutils/docs/ld/Scripts.html>`_
 
-    * - ``framework-arduinoteensy``
-      - `Arduino Wiring-based Framework <http://arduino.cc/en/Reference/HomePage>`_
-
-    * - ``toolchain-gccarmnoneeabi``
-      - `gcc-arm-embedded <https://launchpad.net/gcc-arm-embedded>`_, `GDB <http://www.gnu.org/software/gdb/>`_
-
-    * - ``tool-teensy``
-      - `Teensy Loader <https://www.pjrc.com/teensy/loader.html>`_
-
 .. warning::
     **Linux Users:** Don't forget to install "udev" rules file
     `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`_ (an instruction is located in the file).
@@ -52,6 +55,9 @@ Frameworks
     * - :ref:`framework_arduino`
       - Arduino Framework allows writing cross-platform software to control devices attached to a wide range of Arduino boards to create all kinds of creative coding, interactive objects, spaces or physical experiences.
 
+    * - :ref:`framework_mbed`
+      - The mbed framework The mbed SDK has been designed to provide enough hardware abstraction to be intuitive and concise, yet powerful enough to build complex projects. It is built on the low-level ARM CMSIS APIs, allowing you to code down to the metal if needed. In addition to RTOS, USB and Networking libraries, a cookbook of hundreds of reusable peripheral and module libraries have been built on top of the SDK by the mbed Developer Community.
+
 Boards
 ------
 
diff --git a/platformio/platforms/teensy.py b/platformio/platforms/teensy.py
index 07316d15..3ebc4002 100644
--- a/platformio/platforms/teensy.py
+++ b/platformio/platforms/teensy.py
@@ -35,6 +35,10 @@ class TeensyPlatform(BasePlatform):
             "default": True
         },
 
+        "framework-mbed": {
+            "default": True
+        },
+
         "tool-teensy": {
             "alias": "uploader",
             "default": True