diff --git a/package.xml b/package.xml
index b96e0a141d6106242c9a98a15faa395c5a573ad0..51edba60594e75ae23351293a79c42c72cbcb56a 100644
--- a/package.xml
+++ b/package.xml
@@ -1,4 +1,5 @@
-<package format="2">
+<?xml version="1.0"?>
+<package format="3">
   <name>dynamic-graph</name>
   <version>4.2.0</version>
   <description>
@@ -11,8 +12,18 @@
   <author>Nicolas Mansard</author>
   <author>Olivier Stasse</author>
 
-  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>git</build_depend>
+  <build_depend>doxygen</build_depend>
+  <!-- The following tags are recommended by REP-136 -->
+  <exec_depend condition="$ROS_VERSION == 1">catkin</exec_depend>
+  <exec_depend condition="$ROS_VERSION == 2">ament_cmake</exec_depend>
+  <depend>eigen</depend>
+  <depend>boost</depend>
+  <depend>graphviz</depend>
 
-  <doc_depend>doxygen</doc_depend>
+  <buildtool_depend>cmake</buildtool_depend>
 
+  <export>
+    <build_type>cmake</build_type>
+  </export>
 </package>