diff --git a/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb b/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb
new file mode 100644
index 00000000..b05cd44e
--- /dev/null
+++ b/recipes-ti/multiprocmgr/multiprocmgr-test_git.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "TI Multiproc Manager test code"
+
+include multiprocmgr.inc
+
+DEPENDS = "multiprocmgr cmem"
+RDEPENDS_${PN} = "multiprocmgr mpm-transport cmem"
+
+CC += "-I${STAGING_KERNEL_DIR}/include"
+
+do_compile() {
+	make -C ${S} test
+}
+
+do_install() {
+	install -d ${D}${bindir}/
+	install -c -m 755 ${S}/test/filetestdemo/host/bin/demo_filetest ${D}${bindir}/mpm_demo_filetest
+	install -c -m 755 ${S}/test/sync_test/host/bin/sync_test ${D}${bindir}/mpm_sync_test
+}
diff --git a/recipes-ti/multiprocmgr/multiprocmgr.inc b/recipes-ti/multiprocmgr/multiprocmgr.inc
new file mode 100644
index 00000000..26c89590
--- /dev/null
+++ b/recipes-ti/multiprocmgr/multiprocmgr.inc
@@ -0,0 +1,14 @@
+HOMEPAGE = "http://git.ti.com/cgit/cgit.cgi/keystone-linux/multi-proc-manager.git"
+LICENSE = "BSD-3-Clause & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce208c498eb9669223724dc9c1d8fe4"
+SECTION = "console"
+COMPATIBLE_MACHINE = "keystone"
+
+BRANCH = "master"
+# The following commits correspond to DEV.MPM-2.00.01.07
+SRCREV = "b79e1cdaed78014569d82cf2f748d3f5f91623ee"
+PV = "2.0.1.7"
+
+SRC_URI = "git://git.ti.com/keystone-linux/multi-proc-manager.git;protocol=git;branch=${BRANCH}"
+
+S = "${WORKDIR}/git"
diff --git a/recipes-ti/multiprocmgr/multiprocmgr_git.bb b/recipes-ti/multiprocmgr/multiprocmgr_git.bb
index 3f2e52c6..e1c4f2fd 100644
--- a/recipes-ti/multiprocmgr/multiprocmgr_git.bb
+++ b/recipes-ti/multiprocmgr/multiprocmgr_git.bb
@@ -1,20 +1,32 @@
 DESCRIPTION = "TI Multiproc Manager for KeyStone II"
-HOMEPAGE = "http://gtgit01.gt.design.ti.com/git/?p=projects/multiprocmgr.git;a=summary"
-LICENSE = "BSD & MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fce208c498eb9669223724dc9c1d8fe4"
-SECTION = "console"
-COMPATIBLE_MACHINE = "keystone"
+SUMMARY = "Provides download, debug and other utilities for other cores in the SOC like DSP"
 
-PR = "r1"
+include multiprocmgr.inc
 
-BRANCH ?= "master"
-SRCREV = "8a97fb5c2c06d5f02d30106629f27fe0ca8a4f95"
+DEPENDS = "mpm-transport libdaemon"
+RDEPENDS_${PN} = "syslog-ng"
 
-SRC_URI = "git://gtgit01.gt.design.ti.com/git/projects/multiprocmgr.git;protocol=git;branch=${BRANCH}"
 
-S = "${WORKDIR}/git"
+CC += "-I${STAGING_KERNEL_DIR}/include"
+
+INITSCRIPT_NAME = "mpmsrv-daemon.sh"
+INITSCRIPT_PARAMS = "defaults 10"
+
+inherit update-rc.d
 
 do_install() {
 	install -d ${D}${bindir}/
-	install -c -m 755 ${S}/mpmsrv ${D}${bindir}/mpmsrv
+	install -c -m 755 ${S}/bin/mpmsrv ${D}${bindir}/mpmsrv
+	install -c -m 755 ${S}/bin/mpmcl ${D}${bindir}/mpmcl
+
+	install -d ${D}${sysconfdir}/init.d/
+	install -c -m 755 ${S}/scripts/mpmsrv-daemon.sh ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
+	install -d ${D}${sysconfdir}/mpm/
+	install -c -m 755 ${S}/scripts/crash_callback.sh ${D}${sysconfdir}/mpm/crash_callback.sh
+
+	install -d ${D}${includedir}/
+	install -c -m 755 ${S}/include/* ${D}${includedir}/
+
+	install -d ${D}${libdir}/
+	cp -a ${S}/lib/* ${D}${libdir}/
 }