diff --git a/classes/obmc-phosphor-image.bbclass b/classes/obmc-phosphor-image.bbclass
index 3b4ab56..0462a1f 100644
--- a/classes/obmc-phosphor-image.bbclass
+++ b/classes/obmc-phosphor-image.bbclass
@@ -8,6 +8,7 @@
 # - obmc-phosphor-flash-mgmt          - Phosphor OpenBMC flash management
 # - obmc-phosphor-event-mgmt          - Phosphor OpenBMC event management
 # - obmc-phosphor-user-mgmt           - Phosphor OpenBMC user management
+# - obmc-settings-mgmt                - OpenBMC settings management
 # - obmc-phosphor-system-mgmt         - Phosphor OpenBMC system management
 # - obmc-host-ipmi                    - OpenBMC Host IPMI
 
@@ -21,6 +22,7 @@
 FEATURE_PACKAGES_obmc-flash-mgmt ?= "${@cf_enabled('obmc-phosphor-flash-mgmt', 'virtual-obmc-flash-mgmt', d)}"
 FEATURE_PACKAGES_obmc-event-mgmt ?= "${@df_enabled('obmc-phosphor-event-mgmt', 'virtual-obmc-event-mgmt', d)}"
 FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled('obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt', d)}"
+FEATURE_PACKAGES_obmc-settings-mgmt ?= "${@df_enabled('obmc-settings-mgmt', 'virtual-obmc-settings-mgmt', d)}"
 FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled('obmc-phosphor-system-mgmt', 'virtual-obmc-system-mgmt', d)}"
 FEATURE_PACKAGES_obmc-host-ipmi ?= "${@cf_enabled('obmc-host-ipmi', 'virtual-obmc-host-ipmi-hw', d)}"
 
@@ -32,6 +34,7 @@
         obmc-flash-mgmt \
         obmc-event-mgmt \
         obmc-user-mgmt \
+        obmc-settings-mgmt \
         obmc-system-mgmt \
         obmc-host-ipmi \
         ssh-server-dropbear \
diff --git a/common/recipes-phosphor/host-ipmid/host-ipmid.bb b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
index aae4af8..3638df9 100644
--- a/common/recipes-phosphor/host-ipmid/host-ipmid.bb
+++ b/common/recipes-phosphor/host-ipmid/host-ipmid.bb
@@ -15,9 +15,9 @@
 DEPENDS += "autoconf-archive-native"
 RDEPENDS_${PN}-dev += "obmc-mapper-dev"
 RDEPENDS_${PN} += "clear-once"
-RDEPENDS_${PN} += "settings"
 RDEPENDS_${PN} += "network"
 RDEPENDS_${PN} += "libmapper"
+RRECOMMENDS_${PN} += "virtual-obmc-settings-mgmt"
 SRC_URI += "git://github.com/openbmc/phosphor-host-ipmid"
 
 SRCREV = "00b1e5be1ce0d74541e371790e36a53146cb3b44"
diff --git a/common/recipes-phosphor/settings/settings.bb b/common/recipes-phosphor/settings/phosphor-settings.bb
similarity index 70%
rename from common/recipes-phosphor/settings/settings.bb
rename to common/recipes-phosphor/settings/phosphor-settings.bb
index 6627ee1..09d6850 100644
--- a/common/recipes-phosphor/settings/settings.bb
+++ b/common/recipes-phosphor/settings/phosphor-settings.bb
@@ -5,8 +5,12 @@
 
 inherit obmc-phosphor-license
 inherit obmc-phosphor-systemd
+inherit setuptools
 
+DEPENDS += "python-pyyaml-native"
 RDEPENDS_${PN} += "python-dbus python-pygobject"
+PROVIDES += "virtual/obmc-settings-mgmt"
+RPROVIDES_${PN} += "virtual-obmc-settings-mgmt"
 
 SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
 
@@ -14,9 +18,3 @@
 
 S = "${WORKDIR}/git"
 
-do_install() {
-        install -d ${D}/${sbindir}
-        install ${S}/settings_file.py ${D}/${sbindir}
-        install ${S}/settings_manager.py ${D}/${sbindir}
-}
-
diff --git a/common/recipes-phosphor/settings/settings/settings.service b/common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service
similarity index 100%
rename from common/recipes-phosphor/settings/settings/settings.service
rename to common/recipes-phosphor/settings/phosphor-settings/phosphor-settings.service
diff --git a/conf/distro/include/phosphor-defaults.inc b/conf/distro/include/phosphor-defaults.inc
index 601275e..522a639 100644
--- a/conf/distro/include/phosphor-defaults.inc
+++ b/conf/distro/include/phosphor-defaults.inc
@@ -17,3 +17,4 @@
 PREFERRED_PROVIDER_virtual/obmc-flash-mgmt ?= "obmc-phosphor-flashd"
 PREFERRED_PROVIDER_virtual/obmc-sensor-mgmt ?= "obmc-phosphor-sensord"
 PREFERRED_PROVIDER_virtual/obmc-system-mgmt ?= "obmc-phosphor-sysd"
+PREFERRED_PROVIDER_virtual/obmc-settings-mgmt ?= "phosphor-settings"
diff --git a/conf/distro/openbmc-phosphor.conf b/conf/distro/openbmc-phosphor.conf
index 97667ea..0b62783 100644
--- a/conf/distro/openbmc-phosphor.conf
+++ b/conf/distro/openbmc-phosphor.conf
@@ -26,6 +26,7 @@
         obmc-phosphor-flash-mgmt \
         obmc-phosphor-event-mgmt \
         obmc-phosphor-user-mgmt \
+        obmc-settings-mgmt \
         obmc-phosphor-system-mgmt \
         obmc-host-ipmi \
         ${DISTRO_FEATURES_LIBC} \