diff --git a/linux/nucleoFlasher/nucleoFlasher b/linux/nucleoFlasher/nucleoFlasher
old mode 100644
new mode 100755
diff --git a/linux/stlink_upload b/linux/stlink_upload
index f0dd789b..d72133a8 100755
--- a/linux/stlink_upload
+++ b/linux/stlink_upload
@@ -1,8 +1,12 @@
 #!/bin/bash
-$(dirname $0)/stlink/st-flash write "$4" 0x8000000
+if [ `uname -m` ==  "x86_64" ]; then
+  $(dirname $0)/../linux64/stlink/st-flash write "$4" 0x8000000
+else
+  $(dirname $0)/stlink/st-flash write "$4" 0x8000000
+fi
 exit 0
 
-## Remove the lines 2 and 3 (above) if you want this script to wait until the Serial device has been enumerated and loaded before the script exits
+## Remove the lines 2 to 7 (above) if you want this script to wait until the Serial device has been enumerated and loaded before the script exits
 
 # Check for leaf device.
 function leaf_status()
diff --git a/nucleoFlasher/nucleoFlasher b/nucleoFlasher/nucleoFlasher
old mode 100644
new mode 100755