diff --git a/MAINTAINERS b/MAINTAINERS
index 0fbc2d1..dd14e74 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -68,12 +68,19 @@
 R:  Joel Stanley <joel@jms.id.au> <shenki!>
 
 @ipmi-fru-parser://*
+M:  Vernon Mauery <vernon.mauery@linux.intel.com> <vmauery!>
+M:  Tom Joseph <tomjose@linux.vnet.ibm.com> <tomjoseph!>
+M:  Emily Shaffer <emilyshaffer@google.com> <emilyshaffer!>
 
 @ipmitool://*
 F:  https://sourceforge.net/p/ipmitool/source/ci/master/tree/
 M:  Jeremy Kerr <jk@ozlabs.org> <jk!>
 M:  # TODO: Did not see a clear candidate for who should be the backup
 R:  Jeremy Kerr <jk@ozlabs.org> <jk!>
+# FOR CHANGES TO THE OPENBMC BRANCH:
+M:  Vernon Mauery <vernon.mauery@linux.intel.com> <vmauery!>
+M:  Tom Joseph <tomjose@linux.vnet.ibm.com> <tomjoseph!>
+M:  Emily Shaffer <emilyshaffer@google.com> <emilyshaffer!>
 
 # THIS REPOSITORY HAS A DIFFERENT SUBMISSION PROCESS: please send patches using
 # "git send-email"
@@ -142,7 +149,7 @@
 R:  Andrew Geissler <andrewg@us.ibm.com> <andrewg!>
 
 @openpower-host-ipmi-oem://*
-R:  Tom Joseph <tomjoseph@in.ibm.com> <tomjose!>
+M:  Tom Joseph <tomjose@linux.vnet.ibm.com> <tomjoseph!>
 R:  William Li (Nan Li, 李楠) <william.bjlinan@hotmail.com> <williamNanLi!>
 
 @openpower-inventory-upload://*
@@ -156,9 +163,11 @@
 R:  Andrew Geissler <andrewg@us.ibm.com> <andrewg!>
 
 @phosphor-host-ipmid://*
+M:  Vernon Mauery <vernon.mauery@linux.intel.com> <vmauery!>
+M:  Tom Joseph <tomjose@linux.vnet.ibm.com> <tomjoseph!>
+M:  Emily Shaffer <emilyshaffer@google.com> <emilyshaffer!>
 R:  Chris Austen <austenc@us.ibm.com> <causten!>
 R:  Adriana Kobylak <anoo@us.ibm.com> <anoo!>
-R:  Tom Joseph <tomjoseph@in.ibm.com> <tomjose!>
 R:  William Li (Nan Li, 李楠) <william.bjlinan@hotmail.com> # TODO: MISSING IRC HANDLE (william?)
 
 @phosphor-hwmon://*
@@ -178,7 +187,9 @@
 R:  Matt Spinler <mspinler@linux.vnet.ibm.com> <mspinler!>
 
 @phosphor-net-ipmid://*
-R:  Tom Joseph <tomjoseph@in.ibm.com> <tomjose!>
+M:  Vernon Mauery <vernon.mauery@linux.intel.com> <vmauery!>
+M:  Tom Joseph <tomjose@linux.vnet.ibm.com> <tomjoseph!>
+M:  Emily Shaffer <emilyshaffer@google.com> <emilyshaffer!>
 
 @phosphor-networkd://*
 R:  Ratan Gupta <ratagupt@linux.vnet.ibm.com> # TODO: MISSING IRC HANDLE