Index: clang-tools-extra/CODE_OWNERS.TXT
===================================================================
--- clang-tools-extra/CODE_OWNERS.TXT
+++ clang-tools-extra/CODE_OWNERS.TXT
@@ -4,26 +4,27 @@
 in or not.
 
 The list is sorted by surname and formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), web-address
-(W), PGP key ID and fingerprint (P), description (D), and snail-mail address
-(S).
+beautification by scripts.  The fields are: name (N), email (E), Phabricator
+handle (H), and description (D).
 
 N: Aaron Ballman
 E: aaron@aaronballman.com
+H: aaron.ballman
 D: clang-query
 
-N: Manuel Klimek
-E: klimek@google.com
-D: clang-rename, all parts of clang-tools-extra not covered by someone else
-
-N: Alexander Kornienko
-E: alexfh@google.com
-D: clang-tidy
-
 N: Julie Hockett
 E: juliehockett@google.com
 D: clang-doc
 
+N: Nathan James
+E: n.james93@hotmail.co.uk
+H: njames93
+D: clang-tidy
+
+N: Manuel Klimek
+E: klimek@google.com
+D: clang-rename, all parts of clang-tools-extra not covered by someone else
+
 N: Sam McCall
 E: sammccall@google.com
 D: clangd
Index: clang/CODE_OWNERS.TXT
===================================================================
--- clang/CODE_OWNERS.TXT
+++ clang/CODE_OWNERS.TXT
@@ -4,9 +4,8 @@
 what goes in or not.
 
 The list is sorted by surname and formatted to allow easy grepping and
-beautification by scripts.  The fields are: name (N), email (E), web-address
-(W), PGP key ID and fingerprint (P), description (D), and snail-mail address
-(S).
+beautification by scripts.  The fields are: name (N), email (E), Phabricator
+handle (H), and description (D).
 
 N: Alexey Bader
 E: alexey.bader@intel.com
@@ -14,29 +13,71 @@
 
 N: Aaron Ballman
 E: aaron@aaronballman.com
-D: Clang attributes
+H: aaron.ballman
+D: All parts of Clang not covered by someone else, C standards conformance
 
 N: Alexey Bataev
 E: a.bataev@hotmail.com
 D: OpenMP support
 
-N: Chandler Carruth
-E: chandlerc@gmail.com
-E: chandlerc@google.com
-D: CMake, library layering
-
 N: Eric Christopher
 E: echristo@gmail.com
 D: Debug Information, inline assembly
 
-N: Devin Coughlin
-E: dcoughlin@apple.com
+N: Artem Dergachev
+E: adergachev@apple.com
+H: NoQ
 D: Clang Static Analyzer
 
+N: John Ericson
+E: git@johnericson.me
+H: Ericson2314
+D: CMake integration
+
+N: Eli Friedman
+E: efriedma@quicinc.com
+H: efriedma
+D: Clang LLVM IR generation
+
+N: Stanislav Gatev
+E: sgatev@google.com
+H: sgatev
+D: Analysis & CFG
+
 N: Doug Gregor
 E: dgregor@apple.com
 D: Emeritus owner
 
+N: Dmitri Gribenko
+E: gribozavr@gmail.com
+H: gribozavr
+D: Analysis & CFG
+
+N: Tom Honermann
+E: tom@honermann.net
+H: tahonermann
+D: Text encodings
+
+N: Gábor Horváth
+E: xazax.hun@gmail.com
+H: xazax.hun
+D: Clang Static Analyzer
+
+N: Petr Hosek
+E: phosek@google.com
+H: phosek
+D: CMake integration
+
+N: Corentin Jabot
+E: corentin.jabot@gmail.com
+H: cor3ntin
+D: Text encodings
+
+N: Erich Keane
+E: erich.keane@intel.com
+H: ErichKeane
+D: Attributes, Templates
+
 N: Reid Kleckner
 E: rnk@google.com
 D: Microsoft C++ ABI compatibility and general Windows support
@@ -49,9 +90,24 @@
 E: anton@korobeynikov.info
 D: Exception handling, Windows codegen, ARM EABI
 
+N: Yitzhak Mandelbaum
+E: yitzhakm@google.com
+H: ymandel
+D: Analysis & CFG
+
 N: John McCall
 E: rjmccall@apple.com
-D: Clang LLVM IR generation
+D: Clang LLVM IR generation, Itanium ABI, Objective-C conformance
+
+N: MyDeveloperDay
+E: mydeveloperday@gmail.com
+H: MyDeveloperDay
+D: clang-format
+
+N: Owen Pan
+E: owenpiano@gmail.com
+H: owenpan
+D: clang-format
 
 N: Brad Smith
 E: brad@comstyle.com
@@ -59,8 +115,33 @@
 
 N: Richard Smith
 E: richard@metafoo.co.uk
-D: All parts of Clang not covered by someone else
+D: Emeritus owner
+
+N: Fangrui Song
+E: maskray@google.com
+H: MaskRay
+D: Clang Driver parts not covered by someone else
+
+N: Michael Spencer
+E: bigcheesegs@gmail.com
+H: Bigcheese
+D: Modules & Serialization
 
 N: Anastasia Stulova
 E: anastasia.stulova@arm.com
 D: OpenCL support
+
+N: Jan Svoboda
+E: jan_svoboda@apple.com
+H: jansvoboda11
+D: Compiler Options
+
+N: Hubert Tong
+E: hubert.reinterpretcast@gmail.com
+H: hubert.reinterpretcast
+D: C++ standards conformance
+
+N: Chuanqi Xu
+E: yedeng.yd@linux.alibaba.com
+H: ChuanqiXu
+D: Modules & Serialization