diff --git a/docs/platforms/atmelavr_extra.rst b/docs/platforms/atmelavr_extra.rst
index 23b4c2d2..6cee5f0b 100644
--- a/docs/platforms/atmelavr_extra.rst
+++ b/docs/platforms/atmelavr_extra.rst
@@ -9,6 +9,8 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 
+.. _atmelavr_upload_via_programmer:
+
 Upload using Programmer
 -----------------------
 
@@ -36,7 +38,8 @@ Configuration for the programmers:
     .. code-block:: ini
 
         [env:myenv]
-        ...
+        platform = atmelavr
+        framework = arduino
         upload_protocol = stk500v2
         upload_flags = -Pusb
 
@@ -82,3 +85,18 @@ Configuration for the programmers:
         # edit these lines
         upload_port = SERIAL_PORT_HERE
         upload_speed = 19200
+
+Examples
+--------
+
+All project examples are located in PlatformIO repository
+`Examples for Atmel AVR platform <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino>`_.
+
+* `Wiring Blink <https://github.com/platformio/platformio/tree/develop/examples/wiring-blink>`_
+* `Arduino with external libraries <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/arduino-external-libs>`_
+* `Arduino with internal libraries <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/arduino-internal-libs>`_
+* `Project uses source file name for "src" directory (Arduino project structure) <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/arduino-own-src_dir>`_
+* `Atmel AVR Native blink <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/atmelavr-native-blink>`_
+* `Digitstump Mouse <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/digitstump-mouse>`_
+* `Engduino magnetometer <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/engduino-magnetometer>`_
+* `PanStamp blink <https://github.com/platformio/platformio/tree/develop/examples/atmelavr-and-arduino/panstamp-blink>`_
diff --git a/docs/projectconf.rst b/docs/projectconf.rst
index 23571f79..f2ca9ef6 100644
--- a/docs/projectconf.rst
+++ b/docs/projectconf.rst
@@ -532,9 +532,11 @@ Examples
     platform = atmelavr
     framework = arduino
     board = pro8MHzatmega328
-    upload_protocol = usbasp -B5
+    upload_protocol = usbasp
+    upload_flags = -Pusb -B5
 
-Then upload firmware using :option:`platformio run --target program`
+Then upload firmware using :option:`platformio run --target program`. To use
+other programmers see :ref:`atmelavr_upload_via_programmer`.
 
 
 4. :ref:`platform_ststm32`: Upload firmware using GDB script ``upload.gdb``,