diff --git a/package.xml b/package.xml
index 49b3532dd748dd0a9873d38bff548ff808c72a8d..65deb5e47e74f1641dc1124e1e817fd21aa3a51f 100644
--- a/package.xml
+++ b/package.xml
@@ -1,19 +1,29 @@
-<?xml version='1.0'?>
- <package format='2'>
- <name>hpp-statistics</name>
- <version>6.0.0</version>
- <description>Classes for doing statistics. </description>
+<?xml version="1.0"?>
+<package format="3">
+  <name>hpp-statistics</name>
+  <version>6.0.0</version>
+  <description>Classes for doing statistics. </description>
 
- <maintainer email='hpp@laas.fr'>Joseph Mirabel</maintainer>
- <license>LGPL</license>
+  <maintainer email="guilhem.saurel@laas.fr">Guilhem Saurel</maintainer>
 
- <!-- <url type='website'>https://github.com/humanoid-path-planner/hpp-statistics </url> -->
+  <author>Joseph Mirabel</author>
+  <author>Florent Lamiraux et al.</author>
 
- <author>Joseph Mirabel</author>
- <author>Florent Lamiraux et al.</author>
+  <license>BSD-2</license>
 
- <buildtool_depend>catkin</buildtool_depend>
- <build_depend>hpp-util</build_depend>
- <exec_depend>hpp-util</exec_depend>
- <build_export_depend>hpp-util</build_export_depend>
- </package>
+  <url type="website">https://github.com/humanoid-path-planner/hpp-statistics</url>
+  <url type="repository">https://github.com/humanoid-path-planner/hpp-statistics</url>
+  <url type="bugtracker">https://github.com/humanoid-path-planner/hpp-statistics/issues</url>
+
+  <buildtool_depend condition="$ROS_VERSION == 1">catkin</buildtool_depend>
+  <buildtool_depend condition="$ROS_VERSION == 2">ament_cmake</buildtool_depend>
+  <buildtool_depend>cmake</buildtool_depend>
+
+  <build_depend>doxygen</build_depend>
+
+  <depend>hpp-util</depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
+</package>
\ No newline at end of file