diff --git a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb
index 9a598da..8ffc41b 100644
--- a/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb
+++ b/meta-phosphor/common/recipes-phosphor/dbus/phosphor-mapper.bb
@@ -5,14 +5,17 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 
+inherit pythonnative
+inherit autotools pkgconfig
 inherit obmc-phosphor-dbus-service
 inherit obmc-phosphor-systemd
-inherit setuptools
 
 DEPENDS += "systemd"
+DEPENDS += "autoconf-archive-native"
 
 DBUS_SERVICE_${PN} += "org.openbmc.ObjectMapper.service"
 SYSTEMD_SERVICE_${PN} = "mapper-wait@.service"
+RDEPENDS_libmapper += "libsystemd"
 RDEPENDS_${PN} += " \
         python-xml \
         python-dbus \
@@ -20,17 +23,14 @@
         "
 SRC_URI += "git://github.com/openbmc/phosphor-objmgr"
 
-SRCREV = "36eb1e52265f2c765d0f0c56914841a1e2f54fe5"
+SRCREV = "7122244c83092499dc8d7836da0a63a08c734856"
 
 S = "${WORKDIR}/git"
 
-do_compile_append() {
-        oe_runmake -C libmapper
-}
-
-do_install_append() {
-        oe_runmake -C libmapper install DESTDIR=${D}
-}
+export BUILD_SYS
+export HOST_SYS
+export STAGING_INCDIR
+export STAGING_LIBDIR
 
 python populate_packages_prepend () {
     mapperlibdir = d.getVar("libdir", True)
@@ -38,3 +38,4 @@
 }
 PACKAGES_DYNAMIC += "^libmapper.*"
 FILES_${PN}_remove = "${libdir}/lib*.so.* ${libdir}/*"
+FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}"