diff --git a/common/recipes-bsp/u-boot/u-boot.inc b/common/recipes-bsp/u-boot/u-boot-ubi.inc
similarity index 81%
rename from common/recipes-bsp/u-boot/u-boot.inc
rename to common/recipes-bsp/u-boot/u-boot-ubi.inc
index f2f2d31..ec5f861 100644
--- a/common/recipes-bsp/u-boot/u-boot.inc
+++ b/common/recipes-bsp/u-boot/u-boot-ubi.inc
@@ -1,8 +1,8 @@
 inherit image_version
 
-SRC_URI += "file://0001-configs-ast-Add-redundnant-env.patch"
+SRC_URI_append = " file://0001-configs-ast-Add-redundnant-env.patch"
 
-SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
+SRC_URI_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
     'file://0001-config-ast-common-hack-bootopts.patch \
      file://0004-config-ast-common-ubi-bootops.patch \
      file://0001-config-ast-common-Add-conditional-factory-reset-comm.patch', '', d)}"
diff --git a/common/recipes-bsp/u-boot/u-boot_2016.07.bb b/common/recipes-bsp/u-boot/u-boot_2016.07.bb
index bcb95fe..0360f23 100644
--- a/common/recipes-bsp/u-boot/u-boot_2016.07.bb
+++ b/common/recipes-bsp/u-boot/u-boot_2016.07.bb
@@ -1,5 +1,5 @@
 require recipes-bsp/u-boot/u-boot.inc
 require u-boot-common.inc
-require u-boot.inc
+require u-boot-ubi.inc
 
 DEPENDS += "dtc-native"