diff --git a/common/recipes-bsp/u-boot/u-boot.inc b/common/recipes-bsp/u-boot/u-boot.inc
index 492e3f7..03b7a61 100644
--- a/common/recipes-bsp/u-boot/u-boot.inc
+++ b/common/recipes-bsp/u-boot/u-boot.inc
@@ -4,6 +4,9 @@
 UBRANCH = "v2016.07-aspeed-openbmc"
 SRC_URI = "git://git@github.com/openbmc/u-boot.git;branch=${UBRANCH};protocol=https"
 
+SRC_URI += "${@bb.utils.contains('MACHINE_FEATURES', 'obmc-ubi-fs', \
+    'file://0001-config-ast-common-hack-bootopts.patch', '', d)}"
+
 PV = "v2016.07+git${SRCPV}"
 
 SRC_URI += "file://0001-configs-ast-Add-redundnant-env.patch"