diff --git a/packages/linux-firmware/x86-firmware/firmwares/any.dat b/packages/linux-firmware/kernel-firmware/firmwares/any.dat
similarity index 100%
rename from packages/linux-firmware/x86-firmware/firmwares/any.dat
rename to packages/linux-firmware/kernel-firmware/firmwares/any.dat
diff --git a/packages/linux-firmware/x86-firmware/firmwares/x86_64.dat b/packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
similarity index 100%
rename from packages/linux-firmware/x86-firmware/firmwares/x86_64.dat
rename to packages/linux-firmware/kernel-firmware/firmwares/x86_64.dat
diff --git a/packages/linux-firmware/x86-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk
similarity index 94%
rename from packages/linux-firmware/x86-firmware/package.mk
rename to packages/linux-firmware/kernel-firmware/package.mk
index 027dbce42d..1dae1632df 100644
--- a/packages/linux-firmware/x86-firmware/package.mk
+++ b/packages/linux-firmware/kernel-firmware/package.mk
@@ -16,7 +16,7 @@
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="x86-firmware"
+PKG_NAME="kernel-firmware"
 PKG_VERSION="b141345"
 PKG_ARCH="any"
 PKG_LICENSE="other"
@@ -25,8 +25,8 @@ PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware
 PKG_SOURCE_DIR="$PKG_VERSION"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_SECTION="linux-firmware"
-PKG_SHORTDESC="x86-firmware: x86 related firmware"
-PKG_LONGDESC="x86-firmware: x86 related firmware"
+PKG_SHORTDESC="kernel-firmware: kernel related firmware"
+PKG_LONGDESC="kernel-firmware: kernel related firmware"
 
 PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
diff --git a/packages/linux-firmware/misc-firmware/package.mk b/packages/linux-firmware/misc-firmware/package.mk
index 96b2149c78..077205454b 100644
--- a/packages/linux-firmware/misc-firmware/package.mk
+++ b/packages/linux-firmware/misc-firmware/package.mk
@@ -22,7 +22,7 @@ PKG_ARCH="any"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/LibreELEC/misc-firmware"
 PKG_URL="https://github.com/LibreELEC/misc-firmware/archive/$PKG_VERSION.tar.gz"
-PKG_DEPENDS_TARGET="toolchain x86-firmware"
+PKG_DEPENDS_TARGET="toolchain kernel-firmware"
 PKG_SECTION="firmware"
 PKG_SHORTDESC="misc-firmware: firmwares for various drivers"
 PKG_LONGDESC="misc-firmware: firmwares for various drivers"
diff --git a/packages/linux/package.mk b/packages/linux/package.mk
index 4a3b329285..a16a958442 100644
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@@ -71,7 +71,7 @@ PKG_AUTORECONF="no"
 PKG_MAKE_OPTS_HOST="ARCH=$TARGET_KERNEL_ARCH headers_check"
 
 if [ "$TARGET_ARCH" = "x86_64" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode x86-firmware"
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET intel-ucode kernel-firmware"
 fi
 
 if [ "$BUILD_ANDROID_BOOTIMG" = "yes" ]; then
@@ -142,7 +142,7 @@ pre_make_target() {
   if [ "$TARGET_ARCH" = "x86_64" ]; then
     # copy some extra firmware to linux tree
     mkdir -p $PKG_BUILD/external-firmware
-      cp -a $(get_build_dir x86-firmware)/{amdgpu,amd-ucode,i915,radeon,rtl_nic} $PKG_BUILD/external-firmware
+      cp -a $(get_build_dir kernel-firmware)/{amdgpu,amd-ucode,i915,radeon,rtl_nic} $PKG_BUILD/external-firmware
 
     mkdir -p $PKG_BUILD/external-firmware/intel-ucode
       cp -a $(get_build_dir intel-ucode)/microcode.bin $PKG_BUILD/external-firmware/intel-ucode