diff --git a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb
index 41a4c1e..06eb55e 100644
--- a/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb
+++ b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd.bb
@@ -4,10 +4,15 @@
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10"
 
-inherit obmc-phosphor-pydbus-service
+inherit obmc-phosphor-dbus-service
 
 PROVIDES += "virtual/obmc-system-mgmt"
 RPROVIDES:${PN} += "virtual-obmc-system-mgmt"
 
 S = "${WORKDIR}"
-SRC_URI += "file://${PN}.py"
+SRC_URI += "file://${BPN}.sh"
+
+do_install() {
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/${BPN}.sh ${D}${bindir}/${BPN}
+}
diff --git a/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service
similarity index 100%
rename from meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.service
rename to meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.service
diff --git a/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh
similarity index 75%
rename from meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py
rename to meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh
index c8080ac..95488d0 100644
--- a/meta-phosphor/recipes-phosphor/system/files/obmc-phosphor-sysd.py
+++ b/meta-phosphor/recipes-phosphor/system/obmc-phosphor-sysd/obmc-phosphor-sysd.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/bin/sh
 
 # Contributors Listed Below - COPYRIGHT 2015
 # [+] International Business Machines Corp.
@@ -16,14 +16,9 @@
 # implied. See the License for the specific language governing
 # permissions and limitations under the License.
 
-import time
-import sys
-import dbus
-import dbus.service
-import dbus.mainloop.glib
+echo "obmc-phosphor-sysd starting..."
 
-if __name__ == '__main__':
-	print "obmc-phosphor-watchdogd starting..."
-
-	while 1:
-		time.sleep(5)
+while true
+do
+	sleep 60
+done