diff --git a/MAINTAINERS b/MAINTAINERS
index 4595d05..95f65fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14,7 +14,7 @@
 
     Section entries are structured according to the following scheme:
 
-    X:  NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>
+    X:  NAME <EMAIL_USERNAME@DOMAIN> <DISCORD_USERNAME!>
     X:  ...
     .
     .
@@ -24,10 +24,10 @@
     organization; FILE_PATH is a file path within the repository, possibly with
     wildcards; X is a tag of one of the following types:
 
-    M:  Denotes maintainer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>;
+    M:  Denotes maintainer; has fields NAME <EMAIL_USERNAME@DOMAIN> <DISCORD_USERNAME!>;
         if omitted from an entry, assume one of the maintainers from the
         MAINTAINERS entry.
-    R:  Denotes reviewer; has fields NAME <EMAIL_USERNAME@DOMAIN> <IRC_USERNAME!>;
+    R:  Denotes reviewer; has fields NAME <EMAIL_USERNAME@DOMAIN> <DISCORD_USERNAME!>;
         these people are to be added as reviewers for a change matching the repo
         path.
     F:  Denotes forked from an external repository; has fields URL.
@@ -42,6 +42,7 @@
 START OF MAINTAINERS LIST
 -------------------------
 
-M:  Matt Spinler <spinler@us.ibm.com> <mspinler[m]!>
+M:  Matt Spinler <spinler@us.ibm.com> <mspinler!>
 M:  Shawn McCarney <shawnmm@us.ibm.com> <ShawnMcCarney!>
-R:  George Liu <liuxiwei@inspur.com> <liuxiwei!>
+R:  George Liu <liuxiwei@inspur.com> <George Liu!>
+R:  B.J. Wyman <bjwyman@gmail.com> <bjwyman!>
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..5a31d18
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,56 @@
+# OWNERS
+# ------
+#
+# The OWNERS file maintains the list of individuals responsible for various
+# parts of this repository, including code review and approval.  We use the
+# Gerrit 'owners' plugin, which consumes this file, along with some extra
+# keywords for our own purposes and tooling.
+#
+# For details on the configuration used by 'owners' see:
+#  https://gerrit.googlesource.com/plugins/owners/+/refs/heads/master/owners/src/main/resources/Documentation/config.md
+#
+# An OWNERS file must be in the root of a repository but may also be present
+# in any subdirectory.  The contents of the subdirectory OWNERS file are
+# combined with parent directories unless 'inherit: false' is set.
+#
+# The owners file is YAML and has [up to] 4 top-level keywords.
+#   * owners: A list of individuals who have approval authority on the
+#     repository.
+#
+#   * reviewers: A list of individuals who have requested review notification
+#     on the repository.
+#
+#   * matches: A list of specific file/path matches for granular 'owners' and
+#     'reviewers'.  See 'owners' plugin documentation.
+#
+#   * openbmc: A list of openbmc-specific meta-data about owners and reviewers.
+#     - name: preferred name of the individual.
+#     - email: preferred email address of the individual.
+#     - discord: Discord nickname of the individual.
+#
+# It is expected that these 4 sections will be listed in the order above and
+# data within them will be kept sorted.
+
+owners:
+- shawnmm@us.ibm.com
+- spinler@us.ibm.com
+
+reviewers:
+- bjwyman@gmail.com
+- liuxiwei@inspur.com
+
+matches:
+
+openbmc:
+- name: B.J. Wyman
+  email: bjwyman@gmail.com
+  discord: bjwyman
+- name: George Liu
+  email: liuxiwei@inspur.com
+  discord: George Liu
+- name: Matt Spinler
+  email: spinler@us.ibm.com
+  discord: mspinler
+- name: Shawn McCarney
+  email: shawnmm@us.ibm.com
+  discord: ShawnMcCarney