diff --git a/PlatformIOAddons/.gitignore b/PlatformIOAddons/.gitignore
new file mode 100644
index 0000000000..5113a62aa1
--- /dev/null
+++ b/PlatformIOAddons/.gitignore
@@ -0,0 +1,2 @@
+.pioenvs
+*.dblite
\ No newline at end of file
diff --git a/PlatformIOAddons/Readme.md b/PlatformIOAddons/Readme.md
new file mode 100644
index 0000000000..e3a1544860
--- /dev/null
+++ b/PlatformIOAddons/Readme.md
@@ -0,0 +1,9 @@
+This folder contains the project file to build and install Marlin firmware using the PlatformIO development environment.
+
+1) Install platformio (See http://platformio.org/)
+
+....
+
+x) From this directory
+  platformio run
+
diff --git a/PlatformIOAddons/platformio.ini b/PlatformIOAddons/platformio.ini
new file mode 100644
index 0000000000..9212964790
--- /dev/null
+++ b/PlatformIOAddons/platformio.ini
@@ -0,0 +1,41 @@
+#
+# Project Configuration File
+#
+# A detailed documentation with the EXAMPLES is located here:
+# http://docs.platformio.org/en/latest/projectconf.html
+#
+
+# A sign `#` at the beginning of the line indicates a comment
+# Comment lines are ignored.
+
+# Automatic targets - enable auto-uploading
+# targets = upload
+
+[platformio]
+src_dir = ../Marlin
+
+[env:mega2560]
+platform = atmelavr
+framework = arduino
+board = megaatmega2560
+board_f_cpu = 16000000L
+
+[env:mega1280]
+platform = atmelavr
+framework = arduino
+board = megaatmega1280
+board_f_cpu = 16000000L
+
+[env:printrboard]
+platform = teensy
+framework = arduino
+board = teensy20pp
+build_flags = -D MOTHERBOARD=BOARD_PRINTRBOARD
+# Bug in arduino framework does not allow boards running at 20Mhz
+#board_f_cpu = 20000000L
+
+[env:brainwavepro]
+platform = teensy
+framework = arduino
+board = teensy20pp
+build_flags = -D MOTHERBOARD=BOARD_BRAINWAVE_PRO -D AT90USBxx_TEENSYPP_ASSIGNMENTS