diff --git a/linux/dfu-util.sh b/linux/dfu-util.sh
new file mode 100755
index 000000000..9b828f090
--- /dev/null
+++ b/linux/dfu-util.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+#
+# Use the correct dfu-util program based on the architecture
+#
+
+# Get the directory where the script is running.
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+# Choose dfu program by arch
+if [ `uname -m` ==  "x86_64" ]; then
+  DFU_UTIL=${DIR}/dfu-util_x86_64/dfu-util
+else
+  DFU_UTIL=${DIR}/dfu-util/dfu-util
+fi
+
+# Not found!
+if [ ! -x "${DFU_UTIL}" ]; then
+  echo "$0: error: cannot find ${DFU_UTIL}" >&2
+  exit 2
+fi
+
+# Pass all parameters through
+"${DFU_UTIL}" "$@"
diff --git a/linux/dfu-util/dfu-prefix b/linux/dfu-util/dfu-prefix
index 88e2d04d6..e0fe84a7e 100755
Binary files a/linux/dfu-util/dfu-prefix and b/linux/dfu-util/dfu-prefix differ
diff --git a/linux/dfu-util/dfu-suffix b/linux/dfu-util/dfu-suffix
index e96df2948..d041af5b9 100755
Binary files a/linux/dfu-util/dfu-suffix and b/linux/dfu-util/dfu-suffix differ
diff --git a/linux/dfu-util/dfu-util b/linux/dfu-util/dfu-util
index e9a959955..e887708aa 100755
Binary files a/linux/dfu-util/dfu-util and b/linux/dfu-util/dfu-util differ
diff --git a/linux/maple_upload b/linux/maple_upload
index cbe047c9f..65d31439b 100755
--- a/linux/maple_upload
+++ b/linux/maple_upload
@@ -26,18 +26,7 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 "${DIR}/upload-reset" ${dummy_port_fullpath} 750
 
-if [ `uname -m` ==  "x86_64" ]; then
-  DFU_UTIL=${DIR}/dfu-util_x86_64/dfu-util
-else
-  DFU_UTIL=${DIR}/dfu-util/dfu-util
-fi
-
-if [ ! -x "${DFU_UTIL}" ]; then
-    echo "$0: error: cannot find ${DFU_UTIL}" >&2
-    exit 2
-fi
-
-"${DFU_UTIL}" -d ${usbID} -a ${altID} -D ${binfile} ${dfuse_addr} -R
+"${DIR}/dfu-util.sh" -d ${usbID} -a ${altID} -D ${binfile} ${dfuse_addr} -R
 
 echo -n Waiting for ${dummy_port_fullpath} serial...