diff --git a/package.xml b/package.xml
index 017d35b47499be60c388e6d4f5ce60b943d50822..df7b292b25b6fee87ff9ce61ce236baad9ded96d 100644
--- a/package.xml
+++ b/package.xml
@@ -1,4 +1,5 @@
-<package format="2">
+<?xml version="1.0"?>
+<package format="3">
   <name>dynamic-graph-python</name>
   <version>3.5.2</version>
   <description>
@@ -11,17 +12,20 @@
   <author>Nicolas Mansard</author>
   <author>Olivier Stasse</author>
 
-  <build_depend>roscpp</build_depend>
-  <build_depend>dynamic-graph</build_depend>
-
-  <exec_depend>roscpp</exec_depend>
-  <exec_depend>dynamic-graph</exec_depend>
-
-  <build_export_depend>roscpp</build_export_depend>
-  <build_export_depend>dynamic-graph</build_export_depend>
-
-  <buildtool_depend>catkin</buildtool_depend>
-
+  <build_depend>git</build_depend>
+  <build_depend>doxygen</build_depend>
   <doc_depend>doxygen</doc_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>dynamic-graph</depend>
+  <depend>roscpp</depend>
+  <depend>boost</depend>
+  
+  <buildtool_depend>cmake</buildtool_depend>
+
+  <export>
+    <build_type>cmake</build_type>
+  </export>
 
 </package>