diff --git a/package.xml b/package.xml
index 900e5b8..5de3290 100644
--- a/package.xml
+++ b/package.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>teleop_twist_keyboard</name>
-  <version>0.6.0</version>
-  <license>BSD License 2.0</license>
+  <version>2.0.0</version>
   <description>
     A robot-agnostic teleoperation node to convert keyboard commands to Twist
     messages.
   </description>
 
-  <maintainer email="namniart@gmail.com">Austin Hendrix</maintainer>
-  <author>Graylin Trevor Jay</author>
+  <maintainer email="clalancette@openrobotics.org">Chris Lalancette</maintainer>
+
+  <license>BSD License 2.0</license>
 
   <url type="website">http://wiki.ros.org/teleop_twist_keyboard</url>
 
+  <author email="namniart@gmail.com">Austin Hendrix</author>
+  <author>Graylin Trevor Jay</author>
+
   <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>rclpy</exec_depend>
 
diff --git a/setup.py b/setup.py
index c7cbcf4..7fb3a1c 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name=package_name,
-    version='0.6.0',
+    version='2.0.0',
     packages=[],
     py_modules=[
         'teleop_twist_keyboard'
@@ -15,9 +15,9 @@
         ('share/' + package_name, ['package.xml']),
     ],
     install_requires=['setuptools'],
-    maintainer='Austin Hendrix',
-    maintainer_email='namniart@gmail.com',
-    author='Graylin Trevor Jay',
+    maintainer='Chris Lalancette',
+    maintainer_email='clalancette@openrobotics.org',
+    author='Graylin Trevor Jay, Austin Hendrix',
     keywords=['ROS'],
     classifiers=[
         'Intended Audience :: Developers',