diff --git a/app/src/processing/app/debug/AvrdudeUploader.java b/app/src/processing/app/debug/AvrdudeUploader.java
old mode 100755
new mode 100644
diff --git a/app/src/processing/app/debug/BossaCUploader.java b/app/src/processing/app/debug/BossaCUploader.java
index 9f9ea5253..cfd69ea5a 100644
--- a/app/src/processing/app/debug/BossaCUploader.java
+++ b/app/src/processing/app/debug/BossaCUploader.java
@@ -43,8 +43,7 @@ public class BossaCUploader extends Uploader {
     String port = Preferences.get("serial.port");
     if (port.startsWith("/dev/"))
       port = port.substring(5);
-    commandDownloader.add("--port=" + (Base.isWindows() ? "\\\\.\\" : "")
-                          + port);
+    commandDownloader.add("--port=" + port);
     commandDownloader.add("-e");
     commandDownloader.add("-w");
     commandDownloader.add("-s");
@@ -76,8 +75,6 @@ public class BossaCUploader extends Uploader {
 
     try {
       String avrBasePath = Base.getHardwarePath() + "/tools/";
-      if (!Base.isLinux())
-        avrBasePath += "avr/bin/";
 
       String[] cmdArray = cmdParams.toArray(new String[0]);
       cmdArray[0] = avrBasePath + cmdArray[0];
diff --git a/app/src/processing/app/debug/Uploader.java b/app/src/processing/app/debug/Uploader.java
old mode 100755
new mode 100644
diff --git a/build/build.xml b/build/build.xml
index 5c328ab28..e8f95ebba 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -445,6 +445,10 @@
       <fileset file="windows/eeprom.h" />
     </copy>
 
+    <copy todir="windows/work/hardware/tools">
+      <fileset file="windows/bossac.exe" />
+    </copy>
+
     <antcall target="assemble">
       <param name="target.path" value="windows/work" />
     </antcall>
diff --git a/build/windows/bossac.exe b/build/windows/bossac.exe
new file mode 100755
index 000000000..86445494d
Binary files /dev/null and b/build/windows/bossac.exe differ
diff --git a/build/windows/dist/drivers/bossa.inf b/build/windows/dist/drivers/bossa.inf
new file mode 100755
index 000000000..1722074f3
--- /dev/null
+++ b/build/windows/dist/drivers/bossa.inf
@@ -0,0 +1,48 @@
+[Version]                                                       ; Version section
+Signature="$Chicago$"                                           ; All Windows versions
+Class=Ports                                                     ; This is a serial port driver
+ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}                ; Associated GUID
+Provider=%SHUMATECH%                                            ; Driver is provided by SHUMATECH
+DriverVer=05/18/2011,1.0                                        ; Driver version
+
+[DestinationDirs]                                               ; DestinationDirs section
+DefaultDestDir=12                                               ; Default install directory is \drivers or \IOSubSys
+
+[Manufacturer]                                                  ; Manufacturer section
+%SHUMATECH%=ShumaTech,NTamd64                                   ; Only one manufacturer (SHUMATECH), models section is named
+                                                                ; ShumaTech
+
+[ShumaTech]                                                     ; Models section corresponding to SHUMATECH
+%BOSSA%=BOSSA.Install,USB\VID_03EB&PID_6124                     ; Identifies a device with Vendor ID (03EBh) and
+                                                                ; Product ID equal to 6124h. Corresponding Install section
+                                                                ; is named BOSSA.Install
+
+[ShumaTech.NTamd64]                                             ; Models section corresponding to SHUMATECH
+%BOSSA%=BOSSA.Install,USB\VID_03EB&PID_6124                     ; Identifies a device with Vendor ID (03EBh) and
+                                                                ; Product ID equal to 6124h. Corresponding Install section
+                                                                ; is named BOSSA.Install
+
+[BOSSA.Install]                                                 ; Install section
+include=mdmcpq.inf
+CopyFiles=FakeModemCopyFileSection
+AddReg=BOSSA.AddReg                                             ; Registry keys to add are listed in BOSSA.AddReg
+
+[BOSSA.AddReg]                                                  ; AddReg section
+HKR,,DevLoader,,*ntkern
+HKR,,NTMPDriver,,usbser.sys
+HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
+
+[BOSSA.Install.Services]                                        ; Services section
+AddService=usbser,0x00000002,BOSSA.AddService                   ; Assign usbser as the PnP driver for the device
+
+[BOSSA.AddService]                                              ; Service install section
+DisplayName=%USBSer%                                            ; Name of the serial driver
+ServiceType=1                                                   ; Service kernel driver
+StartType=3                                                     ; Driver is started by the PnP manager
+ErrorControl=1                                                  ; Warn about errors
+ServiceBinary=%12%\usbser.sys                                   ; Driver filename
+
+[Strings]                                                       ; Strings section
+SHUMATECH="ShumaTech"                                           ; String value for the SHUMATECH symbol
+BOSSA="BOSSA Program Port"                                      ; String value for the BOSSA symbol
+USBSer="USB Serial Driver"                                      ; String value for the USBSer symbol