diff --git a/README.rst b/README.rst
index cfe5e027..b18aa0e3 100644
--- a/README.rst
+++ b/README.rst
@@ -114,6 +114,12 @@ It has support for many popular embedded platforms like these:
 
 * ``atmelavr`` `Atmel AVR <http://platformio.org/#!/platforms/atmelavr>`_
   (including *Arduino*-based boards, *Microduino, Raspduino, Teensy*)
+* ``atmelsam`` `Atmel SAM <http://platformio.org/#!/platforms/atmelsam>`_
+  (including *Arduino*-based boards, *Digistump DigiX*)
+* ``stm32`` `STM32 <http://platformio.org/#!/platforms/stm32>`_
+  (including *STM32 Discovery* Kits, CMSIS, SPL, libOpenCM3)
+* ``teensy`` `STM32 <http://platformio.org/#!/platforms/teensy>`_
+  (including *Teensy 2 and 3* USB boards)
 * ``timsp430`` `TI MSP430 <http://platformio.org/#!/platforms/timsp430>`_
   (including *MSP430* LaunchPads)
 * ``titiva`` `TI TIVA C <http://platformio.org/#!/platforms/titiva>`_
diff --git a/setup.py b/setup.py
index 1c0972e3..6d5fb2ce 100644
--- a/setup.py
+++ b/setup.py
@@ -41,5 +41,7 @@ setup(
         "Topic :: Software Development",
         "Topic :: Software Development :: Build Tools",
         "Topic :: Software Development :: Compilers"
-    ]
+    ],
+    keywords=("builder library manager atmel avr sam teensy stm32 "
+              "ti msp430 tiva mbed arduino opencm3")
 )