diff --git a/HISTORY.rst b/HISTORY.rst
index e021896e..19313d87 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -29,6 +29,7 @@ PlatformIO 2.0
   (`issue #596 <https://github.com/platformio/platformio/issues/596>`_)
 * Fixed broken compilation for Atmel SAMD based boards except Arduino Due
   (`issue #598 <https://github.com/platformio/platformio/issues/598>`_)
+* Fixed firmware uploading using serial port with spaces in the path
 
 2.8.6 (2016-03-22)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/builder/scripts/atmelavr.py b/platformio/builder/scripts/atmelavr.py
index 4822499a..daff63af 100644
--- a/platformio/builder/scripts/atmelavr.py
+++ b/platformio/builder/scripts/atmelavr.py
@@ -47,7 +47,7 @@ def BeforeUpload(target, source, env):  # pylint: disable=W0613,W0621
         return
 
     env.AutodetectUploadPort()
-    env.Append(UPLOADERFLAGS=["-P", "$UPLOAD_PORT"])
+    env.Append(UPLOADERFLAGS=["-P", '"$UPLOAD_PORT"'])
 
     if env.subst("$BOARD") == "raspduino":
 
diff --git a/platformio/builder/scripts/atmelsam.py b/platformio/builder/scripts/atmelsam.py
index 1c9cd86c..d91b0bf0 100644
--- a/platformio/builder/scripts/atmelsam.py
+++ b/platformio/builder/scripts/atmelsam.py
@@ -84,7 +84,7 @@ else:
         UPLOADER=join("$PIOPACKAGES_DIR", "$PIOPACKAGE_UPLOADER", "bossac"),
         UPLOADERFLAGS=[
             "--info",
-            "--port", "$UPLOAD_PORT",
+            "--port", '"$UPLOAD_PORT"',
             "--erase",
             "--write",
             "--verify",
diff --git a/platformio/builder/scripts/espressif.py b/platformio/builder/scripts/espressif.py
index ca6d8e99..8f74ca71 100644
--- a/platformio/builder/scripts/espressif.py
+++ b/platformio/builder/scripts/espressif.py
@@ -118,7 +118,7 @@ env.Replace(
         "-vv",
         "-cd", "$UPLOAD_RESETMETHOD",
         "-cb", "$UPLOAD_SPEED",
-        "-cp", "$UPLOAD_PORT"
+        "-cp", '"$UPLOAD_PORT"'
     ],
     UPLOADEROTAFLAGS=[
         "--debug",
@@ -292,7 +292,7 @@ else:
             "-vv",
             "-cd", "$UPLOAD_RESETMETHOD",
             "-cb", "$UPLOAD_SPEED",
-            "-cp", "$UPLOAD_PORT",
+            "-cp", '"$UPLOAD_PORT"',
             "-ca", "0x00000",
             "-cf", "${SOURCES[0]}",
             "-ca", "0x40000",
diff --git a/platformio/builder/scripts/nordicnrf51.py b/platformio/builder/scripts/nordicnrf51.py
index ec3a4ab8..a39e94fa 100644
--- a/platformio/builder/scripts/nordicnrf51.py
+++ b/platformio/builder/scripts/nordicnrf51.py
@@ -32,7 +32,7 @@ if env.subst("$BOARD") == "rfduino":
     )
     env.Replace(
         UPLOADER=join("$PIOPACKAGES_DIR", "tool-rfdloader", "rfdloader"),
-        UPLOADERFLAGS=["-q", "$UPLOAD_PORT"],
+        UPLOADERFLAGS=["-q", '"$UPLOAD_PORT"'],
         UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
     )