diff --git a/build/linux/dist.sh b/build/linux/dist.sh
index 6c36bd69f..c76feeae7 100755
--- a/build/linux/dist.sh
+++ b/build/linux/dist.sh
@@ -27,7 +27,6 @@ rm -rf arduino-*
 
 mkdir arduino
 cp -r ../shared/lib arduino/
-cp -r ../shared/libraries arduino/
 cp -r ../shared/tools arduino/
 cp ../../app/lib/antlr.jar arduino/lib/
 cp ../../app/lib/ecj.jar arduino/lib/
@@ -37,6 +36,7 @@ cp ../../app/lib/RXTXcomm.jar arduino/lib/
 cp ../../readme.txt arduino/
 
 cp -r ../../hardware arduino/
+cp -r ../../libraries arduino/
 
 cp -r dist/tools arduino/hardware
 cp dist/lib/librxtxSerial.so arduino/lib
diff --git a/build/linux/dist/arduino b/build/linux/dist/arduino
index b689b52d1..27a0c587d 100755
--- a/build/linux/dist/arduino
+++ b/build/linux/dist/arduino
@@ -1,6 +1,8 @@
  #!/bin/sh
  
 APPDIR="$(dirname -- "${0}")"
+
+cd $APPDIR
  
 for LIB in \
     java/lib/rt.jar \