diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index 720d2460a..ab3ffaad2 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -6,7 +6,7 @@ export CLASSPATH
 # put the directory where this file lives in the front of the path, because
 # that directory also contains jikes, which we will need at runtime.
 #
-PATH=`pwd`/`dirname $0`:`pwd`/java/bin:${PATH}
+PATH=`pwd`/`dirname $0`/tools:${PATH}
 export PATH
 
 # put the directory with the native RXTX libs in the library path
diff --git a/build/linux/dist/tools/uisp b/build/linux/dist/tools/uisp
new file mode 100755
index 000000000..f25e5e709
Binary files /dev/null and b/build/linux/dist/tools/uisp differ
diff --git a/build/linux/make.sh b/build/linux/make.sh
index bc270e6b4..476c30008 100755
--- a/build/linux/make.sh
+++ b/build/linux/make.sh
@@ -60,6 +60,7 @@ echo Copying dist files...
 cp -r dist/lib work/
 #cp -r dist/core work/
 cp -r dist/bootloader work/
+cp -r dist/tools work/
 
 ### -- START BUILDING -------------------------------------------