--- arduino-1.6.5/hardware/arduino/avr/platform.txt-orig	2015-08-17 02:10:20.337122614 +0200
+++ arduino-1.6.5/hardware/arduino/avr/platform.txt	2015-08-17 02:30:10.839411174 +0200
@@ -18,7 +18,7 @@
 compiler.warning_flags.all=-Wall -Wextra
 
 # Default "compiler.path" is correct, change only if you want to overidde the initial value
-compiler.path={runtime.tools.avr-gcc.path}/bin/
+compiler.path=
 compiler.c.cmd=avr-gcc
 compiler.c.flags=-c -g -Os {compiler.warning_flags} -ffunction-sections -fdata-sections -MMD
 # -w flag added to avoid printing a wrong warning http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59396
@@ -85,9 +85,9 @@
 # AVR Uploader/Programmers tools
 # ------------------------------
 
-tools.avrdude.path={runtime.tools.avrdude.path}
-tools.avrdude.cmd.path={path}/bin/avrdude
-tools.avrdude.config.path={path}/etc/avrdude.conf
+tools.avrdude.path=
+tools.avrdude.cmd.path=avrdude
+tools.avrdude.config.path=/etc/avrdude/avrdude.conf
 
 tools.avrdude.upload.params.verbose=-v
 tools.avrdude.upload.params.quiet=-q -q