diff --git a/package.xml b/package.xml
index 142f3fb..6d0a77c 100644
--- a/package.xml
+++ b/package.xml
@@ -4,9 +4,9 @@
   <name>tracetools_analysis</name>
   <version>0.1.0</version>
   <description>Tools for analysing trace data</description>
-
-  <maintainer email="ingo.luetkebohle@de.bosch.com">Ingo Luetkebohle</maintainer>
+  <maintainer email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</maintainer>
   <author email="ingo.luetkebohle@de.bosch.com">Ingo Luetkebohle</author>
+  <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
   <license>GPLv3</license>
 
   <exec_depend>python3-babeltrace</exec_depend>
diff --git a/setup.py b/setup.py
index eab091c..c26bf08 100644
--- a/setup.py
+++ b/setup.py
@@ -11,6 +11,13 @@ setup(
         ('share/' + package_name, ['package.xml']),
     ],
     install_requires=['setuptools'],
+    maintainer='Christophe Bedard',
+    maintainer_email='fixed-term.christophe.bourquebedard@de.bosch.com',
+    author='Ingo Luetkebohle',
+    author_email='ingo.luetkebohle@de.bosch.com',
+    author='Christophe Bedard',
+    author_email='fixed-term.christophe.bourquebedard@de.bosch.com',
+    # url='',
     keywords=['ROS'],
     description='Tools for analysing trace data',
     entry_points={