diff --git a/development/Arduino/Arduino.SlackBuild b/development/Arduino/Arduino.SlackBuild
index d8ac2ff3ca..33b63a5849 100644
--- a/development/Arduino/Arduino.SlackBuild
+++ b/development/Arduino/Arduino.SlackBuild
@@ -105,7 +105,7 @@ find -L . \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 # Prepare toolchain
-tar xvf $CWD/$GCC-atmel$AVR-$AVR_BUILD.tar.gz
+tar xvf $CWD/toolchain-avr-$GCC-atmel$AVR-$AVR_BUILD.tar.gz
 cp $CWD/autoconf-$AUTOCONF.tar.bz2 \
    $CWD/automake-$AUTOMAKE.tar.bz2 \
    $CWD/avr-binutils.tar.bz2 \
@@ -191,7 +191,7 @@ mv arduino{,-builder} examples hardware lib libraries reference \
   tools{,-builder} $PKG/opt/$PRGNAM
 
 # Ownership fixup
-chown -R root:root $PKG/opt/$PRGNAM/tools-builder
+chown -R root:root $PKG/opt/$PRGNAM/tools-builder $PKG/opt/Arduino/hardware
 
 # Make it a bit more user friendly
 mkdir -p $PKG/usr/{bin,share/applications}
diff --git a/development/Arduino/Arduino.info b/development/Arduino/Arduino.info
index 5b9e42b690..8ed2e0612c 100644
--- a/development/Arduino/Arduino.info
+++ b/development/Arduino/Arduino.info
@@ -27,7 +27,7 @@ DOWNLOAD="https://github.com/arduino/Arduino/archive/1.8.3/Arduino-1.8.3.tar.gz
           http://downloads.arduino.cc/tools/avrdude-6.3.0-arduino9-x86_64-pc-linux-gnu.tar.bz2 \
           http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_386.tar.bz2 \
           http://downloads.arduino.cc/tools/arduinoOTA-1.1.1-linux_amd64.tar.bz2 \
-          https://github.com/arduino/toolchain-avr/archive/4.9.2-atmel3.5.3-arduino2.tar.gz \
+          https://github.com/arduino/toolchain-avr/archive/4.9.2-atmel3.5.3-arduino2/toolchain-avr-4.9.2-atmel3.5.3-arduino2.tar.gz \
           http://mirror.switch.ch/ftp/mirror/gnu/autoconf/autoconf-2.64.tar.bz2 \
           http://mirror.switch.ch/ftp/mirror/gnu/automake/automake-1.11.1.tar.bz2 \
           http://distribute.atmel.no/tools/opensource/Atmel-AVR-GNU-Toolchain/3.5.3/avr-binutils.tar.bz2 \