diff --git a/HISTORY.rst b/HISTORY.rst
index 3797fe06..6ee3b220 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -4,10 +4,16 @@ Release Notes
 PlatformIO 2.0
 --------------
 
+2.9.4 (2016-06-??)
+~~~~~~~~~~~~~~~~~~
+
+* Show ``udev`` warning only for the Linux OS while upload firmware
+
 2.9.3 (2016-06-03)
 ~~~~~~~~~~~~~~~~~~
 
-* Added support for Arduboy, the game system the size of a credit card
+* Added support for `Arduboy <https://www.arduboy.com>`__, the game system
+  the size of a credit card
 * Updated `99-platformio-udev.rules <https://github.com/platformio/platformio/blob/develop/scripts/99-platformio-udev.rules>`__ for Linux OS
 * Refactored firmware uploading to the embedded boards with SAM-BA bootloader
 
diff --git a/platformio/builder/tools/pioupload.py b/platformio/builder/tools/pioupload.py
index d839f90f..b7fe229e 100644
--- a/platformio/builder/tools/pioupload.py
+++ b/platformio/builder/tools/pioupload.py
@@ -15,6 +15,7 @@
 from __future__ import absolute_import
 
 from os.path import isfile, join
+from platform import system
 from shutil import copyfile
 from time import sleep
 
@@ -90,7 +91,8 @@ def AutodetectUploadPort(env):
             env.Replace(UPLOAD_PORT=item['disk'])
             break
     else:
-        if not isfile("/etc/udev/99-platformio-udev.rules"):
+        if (system() == "Linux" and
+                not isfile("/etc/udev/99-platformio-udev.rules")):
             print (
                 "\nWarning! Please install `99-platformio-udev.rules` and "
                 "check that your board's PID and VID are listed in the rules."