diff --git a/projects/Amlogic/packages/u-boot/config/fw_env.config b/projects/Amlogic/packages/u-boot-tools-aml/config/fw_env.config
similarity index 100%
rename from projects/Amlogic/packages/u-boot/config/fw_env.config
rename to projects/Amlogic/packages/u-boot-tools-aml/config/fw_env.config
diff --git a/projects/Amlogic/packages/u-boot/package.mk b/projects/Amlogic/packages/u-boot-tools-aml/package.mk
similarity index 82%
rename from projects/Amlogic/packages/u-boot/package.mk
rename to projects/Amlogic/packages/u-boot-tools-aml/package.mk
index 68f416873b..0aab0f5c94 100644
--- a/projects/Amlogic/packages/u-boot/package.mk
+++ b/projects/Amlogic/packages/u-boot-tools-aml/package.mk
@@ -16,20 +16,21 @@
 #  along with LibreELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-PKG_NAME="u-boot"
+PKG_NAME="u-boot-tools-aml"
 PKG_VERSION="2016.03"
 PKG_SHA256="e49337262ecac44dbdeac140f2c6ebd1eba345e0162b0464172e7f05583ed7bb"
 PKG_ARCH="any"
 PKG_SITE="https://www.denx.de/wiki/U-Boot"
 PKG_URL="ftp://ftp.denx.de/pub/u-boot/u-boot-$PKG_VERSION.tar.bz2"
 PKG_SOURCE_DIR="u-boot-$PKG_VERSION"
-PKG_DEPENDS_TARGET="toolchain dtc:host u-boot:host"
+PKG_DEPENDS_TARGET="toolchain dtc:host u-boot-tools-aml:host"
 PKG_LICENSE="GPL"
 PKG_SECTION="tools"
 PKG_SHORTDESC="u-boot: Universal Bootloader project"
 PKG_LONGDESC="U-Boot bootloader utility tools. This package includes the mkimage program, which allows generation of U-Boot images in various formats, and the fw_printenv and fw_setenv programs to read and modify U-Boot's environment and other tools."
 
 make_host() {
+  make mrproper
   make dummy_defconfig
   make tools-only
 }
@@ -42,7 +43,7 @@ make_target() {
 
 makeinstall_host() {
   mkdir -p $TOOLCHAIN/bin
-  cp tools/mkimage $TOOLCHAIN/bin
+    cp tools/mkimage $TOOLCHAIN/bin
 }
 
 makeinstall_target() {
@@ -60,12 +61,4 @@ makeinstall_target() {
   cp tools/mkimage $INSTALL/usr/sbin/mkimage
   cp tools/proftool $INSTALL/usr/sbin/proftool
   cp tools/relocate-rela $INSTALL/usr/sbin/relocate-rela
-
-  mkdir -p $INSTALL/usr/share/bootloader
-  # Always install the update script
-  if [ -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/update.sh ]; then
-    cp -av $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader/update.sh $INSTALL/usr/share/bootloader
-  elif [ -f $PROJECT_DIR/$PROJECT/bootloader/update.sh ]; then
-    cp -av $PROJECT_DIR/$PROJECT/bootloader/update.sh $INSTALL/usr/share/bootloader
-  fi
 }
diff --git a/projects/Amlogic/packages/u-boot/patches/u-boot-tools-0001-dummy_defconfig.patch b/projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0001-dummy_defconfig.patch
similarity index 100%
rename from projects/Amlogic/packages/u-boot/patches/u-boot-tools-0001-dummy_defconfig.patch
rename to projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0001-dummy_defconfig.patch
diff --git a/projects/Amlogic/packages/u-boot/patches/u-boot-tools-0002-allow-multiple-entries.patch b/projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0002-allow-multiple-entries.patch
similarity index 100%
rename from projects/Amlogic/packages/u-boot/patches/u-boot-tools-0002-allow-multiple-entries.patch
rename to projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0002-allow-multiple-entries.patch
diff --git a/projects/Amlogic/packages/u-boot/patches/u-boot-tools-0003-nand_env-hack.patch b/projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0003-nand_env-hack.patch
similarity index 100%
rename from projects/Amlogic/packages/u-boot/patches/u-boot-tools-0003-nand_env-hack.patch
rename to projects/Amlogic/packages/u-boot-tools-aml/patches/u-boot-tools-0003-nand_env-hack.patch