diff -up Arduino-1.6.4/build/linux/dist/arduino.orig Arduino-1.6.4/build/linux/dist/arduino
--- Arduino-1.6.4/build/linux/dist/arduino.orig	2015-05-06 07:24:13.000000000 -0700
+++ Arduino-1.6.4/build/linux/dist/arduino	2015-12-25 00:12:50.327689550 -0800
@@ -1,30 +1,40 @@
-#!/bin/bash
+#!/usr/bin/env bash
+
+if [[ `id -u` -ne 0 ]]; then
+    for group in dialout lock; do
+        if ! groups $USER | grep -q " : .*\b$group\b"; then
+            missing_groups="$missing_groups\n$group"
+        fi
+    done
+    if [[ -n $missing_groups ]] && zenity --title=Arduino --window-icon=/usr/share/icons/hicolor/16x16/apps/arduino.png --question --text "You need to be a member of the following groups to upload code to an Arduino microcontroller over the USB or serial ports:\n$missing_groups" --ok-label='Add' --cancel-label='Ignore'; then
+        pkexec /usr/libexec/arduino-add-groups \
+        && zenity --title=Arduino --window-icon=/usr/share/icons/hicolor/16x16/apps/arduino.png --info --text "You must log out and log in again before any changes will take effect."
+    fi
+fi
 
 CURDIR=`pwd`
-APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
+. /usr/share/java-utils/java-functions
 
-cd "$APPDIR"
+MAIN_CLASS=processing.app.Base
 
-for LIB in \
-    java/lib/rt.jar \
-    java/lib/tools.jar \
-    lib/*.jar \
-    ;
-do
-    CLASSPATH="${CLASSPATH}:${LIB}"
-done
-export CLASSPATH
+set_classpath apache-commons-codec apache-commons-compress apache-commons-exec \
+apache-commons-lang3 apache-commons-logging apache-commons-net bcpg bcprov \
+jackson-core jackson-databind jackson-modules-base jmdns jsch jsemver jssc \
+guava objectweb-asm jackson-annotations guava apache-commons-logging \
+jakarta-commons-httpclient jsch apache-commons-lang3 jssc jsemver 
 
-LD_LIBRARY_PATH=`pwd`/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
-export LD_LIBRARY_PATH
+for lib in /usr/share/arduino/*.jar; do
+    CLASSPATH="$CLASSPATH:$lib"
+done
 
-export PATH="${APPDIR}/java/bin:${PATH}"
+set_flags -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH
 
 if [[ "$@" == *"--upload"* || "$@" == *"--verify"* || "$@" == *"--get-pref"* || "$@" == *"--install-board"* || "$@" == *"--install-library"* ]] ; then
 	SPLASH=""
 else
-	SPLASH="-splash:./lib/splash.png"
+	SPLASH="-splash:/usr/share/arduino/lib/splash.png"
 fi
 
-java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"
+cd /usr/share/arduino
 
+run "$@"