diff --git a/packages/lang/gcc-aarch64/package.mk b/packages/lang/gcc-aarch64/package.mk
index 43c64ca19f..765d6b1035 100644
--- a/packages/lang/gcc-aarch64/package.mk
+++ b/packages/lang/gcc-aarch64/package.mk
@@ -3,13 +3,13 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="gcc-aarch64"
-PKG_VERSION="11.3.0"
-PKG_SHA256="b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39"
+PKG_VERSION="$(get_pkg_version gcc)"
 PKG_LICENSE="GPL-2.0-or-later"
-PKG_SITE="http://gcc.gnu.org/"
-PKG_URL="http://ftpmirror.gnu.org/gcc/gcc-${PKG_VERSION}/gcc-${PKG_VERSION}.tar.xz"
+PKG_URL=""
 PKG_DEPENDS_HOST="toolchain:host ccache:host autoconf:host binutils-aarch64:host gmp:host mpfr:host mpc:host zstd:host"
 PKG_LONGDESC="This package contains the GNU Compiler Collection for 64-bit ARM."
+PKG_DEPENDS_UNPACK+=" gcc"
+PKG_PATCH_DIRS+=" $(get_pkg_directory gcc)/patches"
 
 PKG_CONFIGURE_OPTS_HOST="--target=aarch64-none-elf \
                          --with-sysroot=${SYSROOT_PREFIX} \
@@ -48,6 +48,11 @@ PKG_CONFIGURE_OPTS_HOST="--target=aarch64-none-elf \
                          --disable-shared \
                          --disable-threads"
 
+unpack() {
+  mkdir -p ${PKG_BUILD}
+  tar --strip-components=1 -xf ${SOURCES}/gcc/gcc-${PKG_VERSION}.tar.xz -C ${PKG_BUILD}
+}
+
 post_makeinstall_host() {
   PKG_GCC_PREFIX="${TOOLCHAIN}/bin/aarch64-none-elf-"
   GCC_VERSION=$(${PKG_GCC_PREFIX}gcc -dumpversion)
diff --git a/packages/lang/gcc-aarch64/patches/gcc-allow-newer-autoconf.patch b/packages/lang/gcc-aarch64/patches/gcc-allow-newer-autoconf.patch
deleted file mode 100644
index f0c9919260..0000000000
--- a/packages/lang/gcc-aarch64/patches/gcc-allow-newer-autoconf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c611cd5416ff1042a4adec0e1b12c71e307b508d Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Thu, 24 Apr 2014 22:33:27 +0300
-Subject: [PATCH] allow newer autoconf
-
----
- config/override.m4 |    9 ---------
- 1 files changed, 0 insertions(+), 9 deletions(-)
-
-diff --git a/config/override.m4 b/config/override.m4
-index 52bd1c3..6c39656 100644
---- a/config/override.m4
-+++ b/config/override.m4
-@@ -38,15 +38,6 @@ dnl   m4_define([_GCC_AUTOCONF_VERSION], [X.Y])
- dnl in configure.ac before AC_INIT,
- dnl without rewriting this file.
- dnl Or for updating the whole tree at once with the definition above.
--AC_DEFUN([_GCC_AUTOCONF_VERSION_CHECK],
--[m4_if(m4_defn([_GCC_AUTOCONF_VERSION]),
--  m4_defn([m4_PACKAGE_VERSION]), [],
--  [m4_fatal([Please use exactly Autoconf ]_GCC_AUTOCONF_VERSION[ instead of ]m4_defn([m4_PACKAGE_VERSION])[.])])
--])
--m4_define([AC_INIT], m4_defn([AC_INIT])[
--_GCC_AUTOCONF_VERSION_CHECK
--])
--
- 
- dnl Ensure we do not use a buggy M4.
- m4_if(m4_index([..wi.d.], [.d.]), [-1],
--- 
-1.7.2.5
-
diff --git a/packages/lang/gcc-aarch64/patches/gcc-crosscompile-badness.patch b/packages/lang/gcc-aarch64/patches/gcc-crosscompile-badness.patch
deleted file mode 100644
index 22aa83167f..0000000000
--- a/packages/lang/gcc-aarch64/patches/gcc-crosscompile-badness.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: gcc-4.4+svnr145550/gcc/incpath.c
-===================================================================
---- gcc-4.4+svnr145550.orig/gcc/incpath.c	2009-04-04 13:48:31.000000000 -0700
-+++ gcc-4.4+svnr145550/gcc/incpath.c	2009-04-04 14:49:29.000000000 -0700
-@@ -417,6 +417,26 @@
-   p->construct = 0;
-   p->user_supplied_p = user_supplied_p;
- 
-+    /* A common error when cross compiling is including
-+    host headers. This code below will try to fail fast
-+    for cross compiling. Currently we consider /usr/include,
-+    /opt/include and /sw/include as harmful.  */
-+
-+	{
-+		/* printf("Adding Path: %s\n", p->name ); */
-+		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /usr/include in INCLUDEPATH: %s\n"), p->name);
-+			abort();
-+		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /sw/include in INCLUDEPATH: %s\n"), p->name);
-+			abort();
-+		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("CROSS COMPILE Badness: /opt/include in INCLUDEPATH: %s\n"), p->name);
-+			abort();
-+		 }
-+	}
-+
-+
-   add_cpp_dir_path (p, chain);
- }
-