diff --git a/CHANGELOG.rst b/CHANGELOG.rst
new file mode 100644
index 0000000000000000000000000000000000000000..9b32223cdcd97dc0988aec32b55d187a51b20c0f
--- /dev/null
+++ b/CHANGELOG.rst
@@ -0,0 +1,9 @@
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Changelog for package panda_moveit_config
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+0.7.0 (2018-11-09)
+------------------
+* Initial release of panda_moveit_config into Melodic, including OMPL, CHOMP and STOMP configs
+  We moved/merged this repo from https://github.com/frankaemika/franka_ros.
+* Contributors: Dave Coleman, Florian Walch, Mike Lautman, Raghavender Sahdev
diff --git a/package.xml b/package.xml
index 5ac35b24f215813602211f4b4b2b7841845dd8fd..ebf09f55a2c1133269b0b1ddf6562071f3fdb133 100644
--- a/package.xml
+++ b/package.xml
@@ -1,5 +1,4 @@
 <package>
-
   <name>panda_moveit_config</name>
   <version>0.7.0</version>
   <description>
@@ -16,6 +15,9 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
+  <build_depend>franka_description</build_depend>
+
+  <run_depend>franka_description</run_depend>
   <run_depend>moveit_ros_move_group</run_depend>
   <run_depend>moveit_fake_controller_manager</run_depend>
   <run_depend>moveit_kinematics</run_depend>
@@ -25,10 +27,7 @@
   <run_depend>robot_state_publisher</run_depend>
   <run_depend>xacro</run_depend>
   <run_depend>topic_tools</run_depend>
-  <!-- This package is referenced in the warehouse launch files, but does not build out of the box at the moment. Commented the dependency until this works. -->
+  <!-- This package is referenced in the warehouse launch files, but does not build out of the box at the moment.
+       Commented the dependency until this works. -->
   <!-- <run_depend>warehouse_ros_mongo</run_depend> -->
-  <build_depend>franka_description</build_depend>
-  <run_depend>franka_description</run_depend>
-
-
 </package>