diff --git a/HISTORY.rst b/HISTORY.rst
index ad550843..4ea10ced 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,14 +4,22 @@ Release Notes
 PlatformIO 3.0
 --------------
 
+3.6.1 (2018-??-??)
+~~~~~~~~~~~~~~~~~~
+
+* Build project in "Debug Mode" including debug information with a new
+  ``debug`` target using `platformio run <https://docs.platformio.org/page/userguide/cmd_run.html>`__ command or `targets <http://docs.platformio.org/page/projectconf/section_env_general.html#targets>`__ option in ``platformio.ini``.
+  The last option allows to avoid project rebuilding between "Run/Debug" modes.
+  (`issue #1833 <https://github.com/platformio/platformio-core/issues/1833>`_)
+
 3.6.0 (2018-08-06)
 ~~~~~~~~~~~~~~~~~~
 
-* `Program Memory Usage <https://docs.platformio.org/en/latest/faq.html#program-memory-usage>`_
+* `Program Memory Usage <https://docs.platformio.org/page/faq.html#program-memory-usage>`_
 
   - Print human-readable memory usage information after a build and before uploading
   - Print detailed memory usage information with "sections" and "addresses"
-    in `verbose mode <https://docs.platformio.org/en/latest/userguide/cmd_run.html#cmdoption-platformio-run-v>`__
+    in `verbose mode <https://docs.platformio.org/page/userguide/cmd_run.html#cmdoption-platformio-run-v>`__
   - Check maximum allowed "program" and "data" sizes before uploading/programming
     (`issue #1412 <https://github.com/platformio/platformio-core/issues/1412>`_)
 
diff --git a/docs b/docs
index acce4656..85979eea 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit acce4656728c293707c3df35ff585819e9b19f9e
+Subproject commit 85979eea2115729aa0615e1feaf5bb48b8430b76
diff --git a/platformio/builder/main.py b/platformio/builder/main.py
index 6beb92fb..7093fd97 100644
--- a/platformio/builder/main.py
+++ b/platformio/builder/main.py
@@ -191,6 +191,7 @@ env.AddPreAction(
     env.VerboseAction(lambda source, target, env: env.PrintUploadInfo(),
                       "Configuring upload protocol..."))
 
+AlwaysBuild(env.Alias("debug", DEFAULT_TARGETS))
 AlwaysBuild(env.Alias("__debug", DEFAULT_TARGETS))
 AlwaysBuild(env.Alias("__test", DEFAULT_TARGETS))
 
diff --git a/platformio/builder/tools/platformio.py b/platformio/builder/tools/platformio.py
index 4a92fb10..9346f235 100644
--- a/platformio/builder/tools/platformio.py
+++ b/platformio/builder/tools/platformio.py
@@ -93,7 +93,7 @@ def BuildProgram(env):
     if not Util.case_sensitive_suffixes(".s", ".S"):
         env.Replace(AS="$CC", ASCOM="$ASPPCOM")
 
-    if "__debug" in COMMAND_LINE_TARGETS:
+    if set(["__debug", "debug"]) & set(COMMAND_LINE_TARGETS):
         env.ProcessDebug()
 
     # process extra flags from board