diff --git a/Tools/upload.sh b/Tools/upload.sh
index 4a2e463008..fc8b3aa486 100755
--- a/Tools/upload.sh
+++ b/Tools/upload.sh
@@ -17,7 +17,7 @@ fi
 
 if [ $SYSTYPE = "Linux" ];
 then
-SERIAL_PORTS="/dev/serial/by-id/usb-3D_Robotics*,/dev/serial/by-id/usb-The_Autopilot*"
+SERIAL_PORTS="/dev/serial/by-id/usb-3D_Robotics*,/dev/serial/by-id/usb-The_Autopilot*,/dev/serial/by-id/usb-Bitcraze*"
 fi
 
 if [ $SYSTYPE = "" ];
diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 99c8b5a964..232a6b0870 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -492,6 +492,7 @@ function(px4_add_upload)
 		list(APPEND serial_ports
 			/dev/serial/by-id/usb-3D_Robotics*
 			/dev/serial/by-id/usb-The_Autopilot*
+			/dev/serial/by-id/usb-Bitcraze*
 			/dev/serial/by-id/pci-3D_Robotics*
 			)
 	elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")