diff --git a/HISTORY.rst b/HISTORY.rst
index 394dbf9e..91206a86 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -15,6 +15,7 @@ PlatformIO 3.0
   - Compatibility with the popular IDEs: Eclipse, Atom, VSCode, Sublime Text, etc
   - Windows, MacOS, Linux (+ARMv6-8)
 
+* Project generator for `VIM <http://docs.platformio.org/page/ide/vim.html>`__
 * Multi-line support for the different options in `Project Configuration File "platformio.ini" <http://docs.platformio.org/page/projectconf.html>`__,
   such as: ``build_flags``, ``build_unflags``, etc.
   (`issue #889 <https://github.com/platformio/platformio-core/issues/889>`_)
diff --git a/docs b/docs
index 80edf4a5..3282dffb 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 80edf4a5027a85a41c3eb8b063aec100bda31a1e
+Subproject commit 3282dffb6ad6dfefadb1ca012003937a5e41931a
diff --git a/platformio/ide/tpls/vim/.clang_complete.tpl b/platformio/ide/tpls/vim/.clang_complete.tpl
new file mode 100644
index 00000000..bc09ec0d
--- /dev/null
+++ b/platformio/ide/tpls/vim/.clang_complete.tpl
@@ -0,0 +1,6 @@
+% for include in includes:
+-I{{include}}
+% end
+% for define in defines:
+-D{{!define}}
+% end
\ No newline at end of file
diff --git a/platformio/ide/tpls/vim/.gcc-flags.json.tpl b/platformio/ide/tpls/vim/.gcc-flags.json.tpl
new file mode 100644
index 00000000..5af2ea3a
--- /dev/null
+++ b/platformio/ide/tpls/vim/.gcc-flags.json.tpl
@@ -0,0 +1,8 @@
+{
+  "execPath": "{{ cxx_path.replace("\\", "/") }}",
+  "gccDefaultCFlags": "-fsyntax-only {{! cc_flags.replace(' -MMD ', ' ').replace('"', '\\"') }}",
+  "gccDefaultCppFlags": "-fsyntax-only {{! cxx_flags.replace(' -MMD ', ' ').replace('"', '\\"') }}",
+  "gccErrorLimit": 15,
+  "gccIncludePaths": "{{ ','.join(includes).replace("\\", "/") }}",
+  "gccSuppressWarnings": false
+}
diff --git a/platformio/ide/tpls/vim/.gitignore.tpl b/platformio/ide/tpls/vim/.gitignore.tpl
new file mode 100644
index 00000000..5dac9f52
--- /dev/null
+++ b/platformio/ide/tpls/vim/.gitignore.tpl
@@ -0,0 +1,4 @@
+.pioenvs
+.piolibdeps
+.clang_complete
+.gcc-flags.json