diff --git a/HISTORY.rst b/HISTORY.rst
index a24e490c..63701178 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -10,6 +10,9 @@ PlatformIO 2.0
 * Added support for the new Adafruit boards Bluefruit Micro and Feather
   (`issue #403 <https://github.com/platformio/platformio/issues/403>`_)
 * Updated Arduino framework for Atmel AVR development platform to 1.6.7
+* Documented `firmware uploading for Atmel AVR development platform using
+  Programmers <http://docs.platformio.org/en/latest/platforms/atmelavr.html#upload-using-programmer>`_:
+  AVR ISP, AVRISP mkII, USBtinyISP, USBasp, Parallel Programmer and Arduino as ISP
 
 2.6.3 (2015-12-21)
 ~~~~~~~~~~~~~~~~~~
diff --git a/docs/platforms/atmelavr.rst b/docs/platforms/atmelavr.rst
index 57648bc5..c68ca4bf 100644
--- a/docs/platforms/atmelavr.rst
+++ b/docs/platforms/atmelavr.rst
@@ -924,3 +924,5 @@ ubIQio
       - 16 MHz
       - 32 Kb
       - 2 Kb
+
+.. include:: atmelavr_extra.rst
diff --git a/docs/platforms/atmelavr_extra.rst b/docs/platforms/atmelavr_extra.rst
new file mode 100644
index 00000000..23b4c2d2
--- /dev/null
+++ b/docs/platforms/atmelavr_extra.rst
@@ -0,0 +1,84 @@
+..  Copyright 2014-2015 Ivan Kravets <me@ikravets.com>
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+Upload using Programmer
+-----------------------
+
+To upload firmware using programmer you need to use ``program`` target instead
+``upload`` for :option:`platformio run --target` command. For example,
+``platformio run -t program``.
+
+Configuration for the programmers:
+
+*   AVR ISP
+
+    .. code-block:: ini
+
+        [env:myenv]
+        platform = atmelavr
+        framework = arduino
+        upload_protocol = stk500v1
+        upload_flags = -P$UPLOAD_PORT
+
+        # edit this line with valid upload port
+        upload_port = SERIAL_PORT_HERE
+
+*   AVRISP mkII
+
+    .. code-block:: ini
+
+        [env:myenv]
+        ...
+        upload_protocol = stk500v2
+        upload_flags = -Pusb
+
+*   USBtinyISP
+
+    .. code-block:: ini
+
+        [env:myenv]
+        platform = atmelavr
+        framework = arduino
+        upload_protocol = usbtiny
+
+*   USBasp
+
+    .. code-block:: ini
+
+        [env:myenv]
+        platform = atmelavr
+        framework = arduino
+        upload_protocol = usbasp
+        upload_flags = -Pusb
+
+*   Parallel Programmer
+
+    .. code-block:: ini
+
+        [env:myenv]
+        platform = atmelavr
+        framework = arduino
+        upload_protocol = dapa
+        upload_flags = -F
+
+*   Arduino as ISP
+
+    .. code-block:: ini
+
+        [env:myenv]
+        platform = atmelavr
+        framework = arduino
+        upload_protocol = stk500v1
+        upload_flags = -P$UPLOAD_PORT -b$UPLOAD_SPEED
+
+        # edit these lines
+        upload_port = SERIAL_PORT_HERE
+        upload_speed = 19200