diff --git a/util/find_usbdebug/find_usbdebug.sh b/util/find_usbdebug/find_usbdebug.sh
index 7c893c96a4..460608031e 100755
--- a/util/find_usbdebug/find_usbdebug.sh
+++ b/util/find_usbdebug/find_usbdebug.sh
@@ -45,8 +45,15 @@ dmesgfile=$1
 find_devs_in_tree () {
 	bus=$1
 	port=$2
-	busstr=`printf "Bus %02d" "$bus"`
-	portstr="Port $port"
+
+	# lsusb -t uses 3 digits for bus/port nunmbers as of version 016 and later
+        if [ $(lsusb -V | cut -f 3 -d " ") -lt 16 ]; then
+		busstr=`printf "Bus %02d" "$bus"`
+		portstr="Port $port"
+	else
+		busstr=`printf "Bus %03d" "$bus"`
+		portstr=`printf "Port %03d" "$port"`
+	fi
 
 	hubs_to_ignore="8087:0020 8087:0024 8087:8000 8087:8008"
 	reqlvl=1