diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp b/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp
index d10535c35..542c14ff1 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/main.cpp
@@ -6,6 +6,12 @@
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
+    QString filename;
+    if(argc < 1)
+        filename = QString("C:\\OpenPilot.bin");
+    else
+        filename = QString(argv[0]);
+
     OP_DFU dfu;
 //    dfu.enterDFU(1);
 //    dfu.StartUpload(4,OP_DFU::Descript);
@@ -22,7 +28,7 @@ int main(int argc, char *argv[])
     //dfu.UploadDescription(1,"jose manuel");
     //QString str=dfu.DownloadDescription(1,12);
    // dfu.JumpToApp();
-  dfu.UploadFirmware("C:/OpenPilot.bin");
+  dfu.UploadFirmware(filename.toAscii());
     //qDebug()<<"Description="<<str;
     return a.exec();
 }
diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
index 1305a7891..20428f09d 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/op_dfu.h
@@ -61,7 +61,7 @@ public:
     OP_DFU();
 private:
     pjrc_rawhid hidHandle;
-    int setStartBit(int command){return command|0b00100000;}
+    int setStartBit(int command){return command|0x20;}
 };
 
 #endif // OP_DFU_H
diff --git a/ground/src/experimental/USB_UPLOAD_TOOL/upload.pro b/ground/src/experimental/USB_UPLOAD_TOOL/upload.pro
index cc6d4103c..3e872c878 100644
--- a/ground/src/experimental/USB_UPLOAD_TOOL/upload.pro
+++ b/ground/src/experimental/USB_UPLOAD_TOOL/upload.pro
@@ -24,3 +24,27 @@ win32 {
     LIBS += -lhid \
         -lsetupapi
 }
+
+macx {
+    SOURCES += ../../plugins/rawhid/pjrc_rawhid_mac.cpp
+    SDK = /Developer/SDKs/MacOSX10.5.sdk
+    ARCH = -mmacosx-version-min=10.5 \
+        -arch \
+        ppc \
+        -arch \
+        i386
+    LIBS += $(ARCH) \
+        -Wl,-syslibroot,$(SDK) \
+        -framework \
+        IOKit \
+        -framework \
+        CoreFoundation
+}
+linux-g++ {
+    SOURCES += ../../plugins/rawhid/pjrc_rawhid_unix.cpp
+    LIBS += -lusb
+}
+linux-g++-64 {
+    SOURCES += ../../plugins/rawhid/pjrc_rawhid_unix.cpp
+    LIBS += -lusb
+}