diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
index fb222e7..6c2f2fc 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager.bb
@@ -9,8 +9,9 @@
 
 SOFTWARE_MGR_PACKAGES = " \
     ${PN}-version \
+    ${PN}-download-mgr \
 "
-PACKAGE_BEFORE_PN = "${PN}-version"
+PACKAGES =+ "${SOFTWARE_MGR_PACKAGES}"
 PACKAGES_remove = "${PN}"
 RDEPENDS_${PN}-dev = "${SOFTWARE_MGR_PACKAGES}"
 RDEPENDS_${PN}-staticdev = "${SOFTWARE_MGR_PACKAGES}"
@@ -24,16 +25,30 @@
 inherit autotools pkgconfig
 inherit obmc-phosphor-dbus-service
 
-DEPENDS += "autoconf-archive-native"
-DEPENDS += "sdbusplus"
-DEPENDS += "phosphor-dbus-interfaces"
+DEPENDS += " \
+    autoconf-archive-native \
+    sdbusplus \
+    phosphor-dbus-interfaces \
+    phosphor-logging \
+"
 
-RDEPENDS_${PN}-version += "phosphor-dbus-interfaces sdbusplus"
+RDEPENDS_${PN}-version += " \
+    phosphor-logging \
+    phosphor-dbus-interfaces \
+    sdbusplus \
+"
+RDEPENDS_${PN}-download-mgr += " \
+    phosphor-logging \
+    phosphor-dbus-interfaces \
+    sdbusplus \
+"
 
-FILES_${PN}-version = "${sbindir}/phosphor-version-software-manager"
+FILES_${PN}-version += "${sbindir}/phosphor-version-software-manager"
+FILES_${PN}-download-mgr += "${sbindir}/phosphor-download-manager"
 DBUS_SERVICE_${PN}-version += "xyz.openbmc_project.Software.BMC.Version.service"
+DBUS_SERVICE_${PN}-download-mgr += "xyz.openbmc_project.Software.Download.service"
 
 SRC_URI += "git://github.com/openbmc/phosphor-bmc-code-mgmt"
-SRCREV = "9e408ea12d892a73d133815d4bbd486f8b593f40"
+SRCREV = "4973943157c2c1258e522ed183044dbc9e623863"
 
 S = "${WORKDIR}/git"
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service
index 6ed6c7f..741f586 100644
--- a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.BMC.Version.service
@@ -3,6 +3,7 @@
 Before=mapper-wait@-xyz-openbmc_project-software-version.service
 
 [Service]
+ExecStartPre=/bin/sh -c 'mkdir -p /tmp/images'
 ExecStart={sbindir}/phosphor-version-software-manager
 Restart=always
 Type=dbus
diff --git a/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
new file mode 100644
index 0000000..b0ee4ba
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/flash/phosphor-software-manager/xyz.openbmc_project.Software.Download.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Phosphor Download Manager
+
+[Service]
+ExecStart={sbindir}/phosphor-download-manager
+Restart=always
+Type=dbus
+BusName={BUSNAME}
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index 815f40f..11de82f 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -65,4 +65,5 @@
 SUMMARY_${PN}-software = "Software applications"
 RDEPENDS_${PN}-software = " \
         ${VIRTUAL-RUNTIME_obmc-bmc-code-mgr} \
+        ${VIRTUAL-RUNTIME_obmc-bmc-download-mgr} \
         "
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index 75d51db..0ea531b 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -67,6 +67,12 @@
 # interface.
 VIRTUAL-RUNTIME_obmc-bmc-code-mgr ?= "phosphor-software-manager-version"
 
+# obmc-bmc-download-mgr
+#
+# Provides an implementation of the xyz.openbmc_project.Common.TFTP
+# interface.
+VIRTUAL-RUNTIME_obmc-bmc-download-mgr ?= "phosphor-software-manager-download-mgr"
+
 PREFERRED_PROVIDER_virtual/obmc-logging-mgmt ?= "phosphor-logging"
 PREFERRED_PROVIDER_virtual/obmc-net-ipmi ?= "phosphor-ipmi-net"