diff --git a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
index 555c088..b9a6c99 100644
--- a/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
+++ b/meta-phosphor/common/recipes-phosphor/console/obmc-console/obmc-console.service
@@ -1,8 +1,11 @@
 [Unit]
 Description=Phosphor Console Muxer
+BindsTo=dev-ttyVUART0.device
+After=dev-ttyVUART0.device
 
 [Service]
-ExecStart={sbindir}/obmc-console-server ttyS0
+# TODO: openbmc/obmc-console#5 - Restore this to 'obmc-console-server ttyVUART0'
+ExecStart=/bin/sh -c 'realpath /dev/ttyVUART0 | xargs basename | xargs {sbindir}/obmc-console-server'
 Restart=always
 
 [Install]