diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000..d490d00
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,2 @@
+# This file was generated by https://github.com/audrow/update-ros2-repos
+* @quarkytale
diff --git a/package.xml b/package.xml
index 749e321..6fa9d50 100644
--- a/package.xml
+++ b/package.xml
@@ -12,13 +12,14 @@
     for the skew resulting from moving robots or tilting laser scanners.
   </description>
 
-  <maintainer email="mabel@openrobotics.org">Mabel Zhang</maintainer>
+  <maintainer email="dharini@openrobotics.org">Dharini Dutia</maintainer>
 
   <license>BSD</license>
 
   <author email="dave.hershberger@sri.com">Dave Hershberger</author>
-  <author>Tully Foote</author>
+  <author email="mabel@openrobotics.org">Mabel Zhang</author>
   <author>Radu Bogdan Rusu</author>
+  <author>Tully Foote</author>
   <author email="william@osrfoundation.org">William Woodall</author>
 
   <url>http://ros.org/wiki/laser_geometry</url>