diff --git a/proxmark3.sh b/proxmark3.sh
index 6f648cabf..44c5c7e2c 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 
 function wait4proxmark {
-	echo "Waiting for Proxmark to appear..."
-	while [ ! -e /dev/ttyACM? ]; do
+	echo >&2 "Waiting for Proxmark to appear..."
+	while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
 		sleep .1
 	done
+	local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
+	echo >&2 -e "Found proxmark on ${PM3}\n"
+	echo $PM3
 }
 
 # start proxmark with first detected interface
-wait4promark
-client/proxmark3 /dev/ttyACM?
+client/proxmark3 $(wait4proxmark)
diff --git a/update.sh b/update.sh
index 3ffd43e80..b62d39417 100755
--- a/update.sh
+++ b/update.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 
 function wait4proxmark {
-	echo "Waiting for Proxmark to appear..."
-	while [ ! -e /dev/ttyACM? ]; do
+	echo >&2 "Waiting for Proxmark to appear..."
+	while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
 		sleep .1
 	done
+	local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
+	echo >&2 -e "Found proxmark on ${PM3}\n"
+	echo $PM3
 }
 
 # flash bootroom
-wait4proxmark
-client/flasher /dev/ttyACM? -b bootrom/obj/bootrom.elf
+client/flasher $(wait4proxmark) -b bootrom/obj/bootrom.elf
 
 # flash system image
-wait4proxmark
-client/flasher /dev/ttyACM? armsrc/obj/fullimage.elf 
+client/flasher $(wait4proxmark) armsrc/obj/fullimage.elf