diff --git a/meta-ufispace/conf/layer.conf b/meta-ufispace/conf/layer.conf
new file mode 100644
index 0000000..823a2b0
--- /dev/null
+++ b/meta-ufispace/conf/layer.conf
@@ -0,0 +1,10 @@
+# We have a conf and classes directory, add to BBPATH
+BBPATH .= ":${LAYERDIR}"
+
+# We have recipes-* directories, add to BBFILES
+BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \
+            ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend"
+
+BBFILE_COLLECTIONS += "ufispace-layer"
+BBFILE_PATTERN_ufispace-layer := "^${LAYERDIR}/"
+LAYERSERIES_COMPAT_ufispace-layer = "langdale mickledore"
diff --git a/meta-ufispace/conf/machine/include/ufispace.inc b/meta-ufispace/conf/machine/include/ufispace.inc
new file mode 100644
index 0000000..d0753f4
--- /dev/null
+++ b/meta-ufispace/conf/machine/include/ufispace.inc
@@ -0,0 +1,19 @@
+MACHINE_FEATURES += "\
+    obmc-bmc-state-mgmt \
+    obmc-host-state-mgmt \
+    obmc-chassis-state-mgmt \
+    obmc-host-ipmi \
+    obmc-phosphor-chassis-mgmt \
+    obmc-phosphor-fan-mgmt \
+    obmc-phosphor-flash-mgmt \
+    "
+
+PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ufispace-apps"
+PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-ufispace-apps"
+PREFERRED_PROVIDER_virtual/obmc-flash-mgmt = "packagegroup-ufispace-apps"
+PREFERRED_PROVIDER_virtual/obmc-system-mgmt = "packagegroup-ufispace-apps"
+PREFERRED_PROVIDER_virtual/obmc-host-ipmi-hw = "phosphor-ipmi-kcs"
+
+OVERRIDES .= ":ufispace"
+
+IMAGE_FEATURES:remove = "obmc-ikvm"