diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs.inc b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs.inc
new file mode 100644
index 0000000..f144884
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs.inc
@@ -0,0 +1,17 @@
+SUMMARY = "Tools for manipulating FFS flash images."
+DESCRIPTION = "FFS is the FSP Flash File Structure which is also currently \
+used on OpenPOWER machines for the flash layout."
+
+HOMEPAGE = "https://github.com/open-power/ffs"
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658"
+
+inherit autotools pkgconfig
+
+ALLOW_EMPTY_${PN} = "1"
+PACKAGE_BEFORE_PN += "${PN}-ecc ${PN}-deprecated"
+
+FILES_${PN}-ecc = "${bindir}/ecc"
+FILES_${PN}-deprecated = "${bindir}"
+
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs_git.bb b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs_git.bb
new file mode 100644
index 0000000..2340121
--- /dev/null
+++ b/meta-openbmc-machines/meta-openpower/common/recipes-bsp/ffs/ffs_git.bb
@@ -0,0 +1,8 @@
+require ffs.inc
+
+PV = "v0.1.0+git${SRCPV}"
+
+SRCREV = "3ec70fbc458e32eef0d0b1de79688b4dc48cbd57"
+SRC_URI += "git://github.com/open-power/ffs.git"
+
+S = "${WORKDIR}/git"