diff --git a/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb b/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
new file mode 100644
index 0000000..b3a41a2
--- /dev/null
+++ b/common/recipes-bsp/u-boot/u-boot-aspeed_2016.07.bb
@@ -0,0 +1,5 @@
+require u-boot-common-aspeed_${PV}.inc
+require recipes-bsp/u-boot/u-boot.inc
+
+PROVIDES += "u-boot"
+DEPENDS += "dtc-native"
diff --git a/common/recipes-bsp/u-boot/u-boot-common_2016.07.inc b/common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
similarity index 100%
rename from common/recipes-bsp/u-boot/u-boot-common_2016.07.inc
rename to common/recipes-bsp/u-boot/u-boot-common-aspeed_2016.07.inc
diff --git a/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb b/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
similarity index 94%
rename from common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
rename to common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
index 2b2b62c..713133c 100644
--- a/common/recipes-bsp/u-boot/u-boot-fw-utils_2016.07.bb
+++ b/common/recipes-bsp/u-boot/u-boot-fw-utils-aspeed_2016.07.bb
@@ -1,4 +1,4 @@
-require u-boot-common_${PV}.inc
+require u-boot-common-aspeed_${PV}.inc
 
 SRC_URI += "file://default-gcc.patch"
 SRC_URI += "file://fw_env.config"
@@ -7,6 +7,8 @@
 SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
 DEPENDS = "mtd-utils"
 
+PROVIDES += "u-boot-fw-utils"
+
 INSANE_SKIP_${PN} = "already-stripped"
 EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
 EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH} CC="${CC} ${CFLAGS} ${LDFLAGS}" V=1'
diff --git a/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/common/recipes-bsp/u-boot/u-boot_2016.07.bb
deleted file mode 100644
index 05b1c89..0000000
--- a/common/recipes-bsp/u-boot/u-boot_2016.07.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require u-boot-common_${PV}.inc
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "dtc-native"
diff --git a/conf/machine/include/aspeed.inc b/conf/machine/include/aspeed.inc
index 4990e1a..ff6c83e 100644
--- a/conf/machine/include/aspeed.inc
+++ b/conf/machine/include/aspeed.inc
@@ -1,9 +1,6 @@
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-obmc"
-
-ASPEED_UBOOT_VERSION ?= "v2016.07+git%"
-
-PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot"
-PREFERRED_VERSION_u-boot ?= "${ASPEED_UBOOT_VERSION}"
-PREFERRED_VERSION_u-boot-fw-utils ?= "${ASPEED_UBOOT_VERSION}"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-aspeed"
+PREFERRED_PROVIDER_u-boot ?= "u-boot-aspeed"
+PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils-aspeed"
 
 MACHINEOVERRIDES .= ":aspeed"