diff --git a/Tools/upload.sh b/Tools/upload.sh
index d78abc3d23..4a2e463008 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*"
+SERIAL_PORTS="/dev/serial/by-id/usb-3D_Robotics*,/dev/serial/by-id/usb-The_Autopilot*"
 fi
 
 if [ $SYSTYPE = "" ];
@@ -25,4 +25,4 @@ then
 SERIAL_PORTS="COM32,COM31,COM30,COM29,COM28,COM27,COM26,COM25,COM24,COM23,COM22,COM21,COM20,COM19,COM18,COM17,COM16,COM15,COM14,COM13,COM12,COM11,COM10,COM9,COM8,COM7,COM6,COM5,COM4,COM3,COM2,COM1,COM0"
 fi
 
-python $BASEDIR/px_uploader.py --port $SERIAL_PORTS $1
\ No newline at end of file
+python $BASEDIR/px_uploader.py --port $SERIAL_PORTS $1
diff --git a/cmake/common/px4_base.cmake b/cmake/common/px4_base.cmake
index 7b65c35071..ef05520375 100644
--- a/cmake/common/px4_base.cmake
+++ b/cmake/common/px4_base.cmake
@@ -488,6 +488,7 @@ function(px4_add_upload)
 	if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
 		list(APPEND serial_ports
 			/dev/serial/by-id/usb-3D_Robotics*
+			/dev/serial/by-id/usb-The_Autopilot*
 			/dev/serial/by-id/pci-3D_Robotics*
 			)
 	elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Darwin")