diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..5183742
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# This file was generated by https://github.com/audrow/update-ros2-repos
+* @clalancette
diff --git a/package.xml b/package.xml
index 830744f..f435213 100644
--- a/package.xml
+++ b/package.xml
@@ -4,18 +4,18 @@
   <version>1.2.0</version>
   <description>Python implementation of the URDF parser.</description>
 
+  <maintainer email="clalancette@openrobotics.org">Chris Lalancette</maintainer>
+
   <license>BSD</license>
 
-  <author>Thomas Moulard</author>
-  <author>David Lu</author>
-  <author>Kelsey Hawkins</author>
   <author>Antonio El Khoury</author>
+  <author>David Lu</author>
   <author>Eric Cousineau</author>
   <author email="isucan@gmail.com">Ioan Sucan</author>
   <author email="jacquelinekay1@gmail.com">Jackie Kay</author>
-
-  <maintainer email="clalancette@osrfoundation.org">Chris Lalancette</maintainer>
-  <maintainer email="sloretz@osrfoundation.org">Shane Loretz</maintainer>
+  <author>Kelsey Hawkins</author>
+  <author email="sloretz@osrfoundation.org">Shane Loretz</author>
+  <author>Thomas Moulard</author>
 
   <url type="website">http://wiki.ros.org/urdfdom_py</url>
   <url type="bugtracker">https://github.com/ros/urdf_parser_py/issues</url>
diff --git a/setup.py b/setup.py
index db04cec..864ab83 100644
--- a/setup.py
+++ b/setup.py
@@ -22,6 +22,8 @@
         'Programming Language :: Python',
         'Topic :: Software Development',
     ],
+    maintainer='Chris Lalancette',
+    maintainer_email='clalancette@openrobotics.org',
     description='Python implementation of the URDF parser.',
     license='BSD',
     tests_require=['pytest'],