diff --git a/ros2trace_analysis/package.xml b/ros2trace_analysis/package.xml
index 8188c3c..ffa26fb 100644
--- a/ros2trace_analysis/package.xml
+++ b/ros2trace_analysis/package.xml
@@ -11,8 +11,6 @@
   <url type="bugtracker">https://gitlab.com/ros-tracing/tracetools_analysis/-/issues</url>
   <author email="christophe.bedard@apex.ai">Christophe Bedard</author>
 
-  <buildtool_depend>ament_package</buildtool_depend>
-
   <depend>ros2cli</depend>
   <depend>tracetools_analysis</depend>
 
diff --git a/ros2trace_analysis/setup.py b/ros2trace_analysis/setup.py
index acd12d9..3025c93 100644
--- a/ros2trace_analysis/setup.py
+++ b/ros2trace_analysis/setup.py
@@ -1,9 +1,11 @@
-from ament_package.generate_setuptools_dict import generate_setuptools_dict
 from setuptools import find_packages
 from setuptools import setup
 
 package_name = 'ros2trace_analysis'
-package_info = generate_setuptools_dict(
+
+setup(
+    name=package_name,
+    version='2.0.2',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),
@@ -11,9 +13,24 @@ package_info = generate_setuptools_dict(
             ['resource/' + package_name]),
     ],
     install_requires=['ros2cli'],
-    tests_require=['pytest'],
     zip_safe=True,
+    maintainer=(
+        'Christophe Bedard'
+    ),
+    maintainer_email=(
+        'bedard.christophe@gmail.com'
+    ),
+    author='Christophe Bedard',
+    author_email='christophe.bedard@apex.ai',
+    url='https://gitlab.com/ros-tracing/tracetools_analysis',
     keywords=[],
+    description='The trace-analysis command for ROS 2 command line tools.',
+    long_description=(
+        'The package provides the trace-analysis '
+        'command for the ROS 2 command line tools.'
+    ),
+    license='Apache 2.0',
+    tests_require=['pytest'],
     entry_points={
         'ros2cli.command': [
             f'trace-analysis = {package_name}.command.trace_analysis:TraceAnalysisCommand',
@@ -27,4 +44,3 @@ package_info = generate_setuptools_dict(
         ],
     }
 )
-setup(**package_info)
diff --git a/tracetools_analysis/package.xml b/tracetools_analysis/package.xml
index abba068..c9e4700 100644
--- a/tracetools_analysis/package.xml
+++ b/tracetools_analysis/package.xml
@@ -13,8 +13,6 @@
   <author email="ingo.luetkebohle@de.bosch.com">Ingo Lütkebohle</author>
   <author email="fixed-term.christophe.bourquebedard@de.bosch.com">Christophe Bedard</author>
 
-  <buildtool_depend>ament_package</buildtool_depend>
-
   <depend>tracetools_read</depend>
   <depend>python3-pandas</depend>
 
diff --git a/tracetools_analysis/setup.py b/tracetools_analysis/setup.py
index 740036b..6cf146f 100644
--- a/tracetools_analysis/setup.py
+++ b/tracetools_analysis/setup.py
@@ -1,11 +1,13 @@
 import glob
 
-from ament_package.generate_setuptools_dict import generate_setuptools_dict
 from setuptools import find_packages
 from setuptools import setup
 
 package_name = 'tracetools_analysis'
-package_info = generate_setuptools_dict(
+
+setup(
+    name=package_name,
+    version='2.0.2',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),
@@ -14,8 +16,29 @@ package_info = generate_setuptools_dict(
             ['resource/' + package_name]),
     ],
     install_requires=['setuptools'],
-    tests_require=['pytest'],
+    maintainer=(
+        'Christophe Bedard, '
+        'Ingo Lütkebohle'
+    ),
+    maintainer_email=(
+        'bedard.christophe@gmail.com, '
+        'ingo.luetkebohle@de.bosch.com'
+    ),
+    author=(
+        'Christophe Bedard, '
+        'Ingo Lütkebohle'
+    ),
+    author_email=(
+        'fixed-term.christophe.bourquebedard@de.bosch.com, '
+        'ingo.luetkebohle@de.bosch.com'
+    ),
+    url='https://gitlab.com/ros-tracing/tracetools_analysis',
     keywords=[],
+    description='Tools for analysing trace data.',
+    long_description=(
+        'This package provides tools for analysing trace data, from '
+        'building a model of the trace data to providing plotting utilities.'
+    ),
     entry_points={
         'console_scripts': [
             f'convert = {package_name}.convert:main',
@@ -25,5 +48,6 @@ package_info = generate_setuptools_dict(
             f'memory_usage = {package_name}.scripts.memory_usage:main',
         ],
     },
+    license='Apache 2.0',
+    tests_require=['pytest'],
 )
-setup(**package_info)