diff --git a/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk b/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk
new file mode 100644
index 0000000000..29eedf2c8f
--- /dev/null
+++ b/packages/lang/gcc-linaro-aarch64-linux-gnu/package.mk
@@ -0,0 +1,38 @@
+################################################################################
+#      This file is part of LibreELEC - https://libreelec.tv
+#      Copyright (C) 2017-present Team LibreELEC
+#
+#  LibreELEC is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 2 of the License, or
+#  (at your option) any later version.
+#
+#  LibreELEC is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+
+PKG_NAME="gcc-linaro-aarch64-linux-gnu"
+PKG_VERSION="7.1.1-2017.08"
+PKG_SHA256="cc61203bb1bab9b51e9631dce803be7c00b814577fd7a118113a83448bf6a833"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE=""
+PKG_URL="https://releases.linaro.org/components/toolchain/binaries/7.1-2017.08/aarch64-linux-gnu/gcc-linaro-${PKG_VERSION}-x86_64_aarch64-linux-gnu.tar.xz"
+PKG_SOURCE_DIR="gcc-linaro-${PKG_VERSION}-x86_64_aarch64-linux-gnu"
+PKG_SECTION="lang"
+PKG_SHORTDESC="Linaro Aarch64 GNU Linux Binary Toolchain"
+PKG_AUTORECONF="no"
+
+make_host() {
+  :
+}
+
+makeinstall_host() {
+  mkdir -p $TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/
+    cp -a * $TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu
+}
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 20a331a3a0..85b42971b5 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -74,10 +74,12 @@ case "$LINUX" in
 esac
 
 if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-aarch64-elf:host"
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-elf:host"
-  TARGET_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/aarch64-elf-
+  PKG_DEPENDS_HOST="$PKG_DEPENDS_HOST gcc-linaro-aarch64-linux-gnu:host"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET gcc-linaro-aarch64-linux-gnu:host"
+  PKG_TARGET_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
   HEADERS_ARCH=$TARGET_ARCH
+else
+  PKG_TARGET_PREFIX=$TARGET_PREFIX
 fi
 
 PKG_MAKE_OPTS_HOST="ARCH=${HEADERS_ARCH:-$TARGET_KERNEL_ARCH} headers_check"
@@ -115,7 +117,7 @@ post_patch() {
   sed -i -e "s|^HOSTCC[[:space:]]*=.*$|HOSTCC = $TOOLCHAIN/bin/host-gcc|" \
          -e "s|^HOSTCXX[[:space:]]*=.*$|HOSTCXX = $TOOLCHAIN/bin/host-g++|" \
          -e "s|^ARCH[[:space:]]*?=.*$|ARCH = $TARGET_KERNEL_ARCH|" \
-         -e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $TARGET_PREFIX|" \
+         -e "s|^CROSS_COMPILE[[:space:]]*?=.*$|CROSS_COMPILE = $PKG_TARGET_PREFIX|" \
          $PKG_BUILD/Makefile
 
   cp $KERNEL_CFG_FILE $PKG_BUILD/.config
diff --git a/packages/lang/gcc-linaro-aarch64-elf/package.mk b/projects/Odroid_C2/packages/gcc-linaro-aarch64-elf/package.mk
similarity index 100%
rename from packages/lang/gcc-linaro-aarch64-elf/package.mk
rename to projects/Odroid_C2/packages/gcc-linaro-aarch64-elf/package.mk
diff --git a/packages/lang/gcc-linaro-arm-eabi/package.mk b/projects/Odroid_C2/packages/gcc-linaro-arm-eabi/package.mk
similarity index 100%
rename from packages/lang/gcc-linaro-arm-eabi/package.mk
rename to projects/Odroid_C2/packages/gcc-linaro-arm-eabi/package.mk
diff --git a/scripts/build b/scripts/build
index 68bba6f6af..63b9ed2f6e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -205,7 +205,7 @@ if [ ! -f $STAMP ]; then
 
     if [ "$PKG_IS_KERNEL_PKG" = "yes" ]; then
       if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-        TARGET_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/aarch64-elf-
+        TARGET_PREFIX=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-
       fi
     fi
 
diff --git a/scripts/image b/scripts/image
index 491f38dc72..9f28cc34fb 100755
--- a/scripts/image
+++ b/scripts/image
@@ -224,7 +224,7 @@ $TOOLCHAIN/bin/depmod -b $INSTALL/usr/lib/kernel-overlays/base -a -e -F "$BUILD/
 
 # strip kernel modules
 if [ "$TARGET_KERNEL_ARCH" = "arm64" -a "$TARGET_ARCH" = "arm" ]; then
-  STRIP=$TOOLCHAIN/lib/gcc-linaro-aarch64-elf/bin/aarch64-elf-strip
+  STRIP=$TOOLCHAIN/lib/gcc-linaro-aarch64-linux-gnu/bin/aarch64-linux-gnu-strip
 fi
 for MOD in `find $INSTALL/usr/lib/kernel-overlays/ -type f -name *.ko`; do
   $STRIP --strip-debug $MOD