diff --git a/HISTORY.rst b/HISTORY.rst
index eda258b4..82197e67 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,6 +7,8 @@ Release History
 * Allow to specify library compatibility with the all platforms/frameworks using
   ``*`` symbol in
   `library.json <http://docs.platformio.org/en/latest/librarymanager/config.html>`__
+* Fixed ``stk500v2_command(): command failed``
+  (`issue #238 <https://github.com/platformio/platformio/issues/238>`_)
 
 2.1.1 (2015-06-09)
 ------------------
diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py
index f86f130f..1027b6a4 100644
--- a/platformio/builder/scripts/atmelavr.py
+++ b/platformio/builder/scripts/atmelavr.py
@@ -30,7 +30,10 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         env.Replace(UPLOAD_SPEED=None)
 
     if env.subst("$UPLOAD_SPEED"):
-        env.Append(UPLOADERFLAGS=["-b", "$UPLOAD_SPEED"])
+        env.Append(UPLOADERFLAGS=[
+            "-b", "$UPLOAD_SPEED",
+            "-D"
+        ])
 
     if not upload_options.get("require_upload_port", False):
         return