diff --git a/collada_parser/package.xml b/collada_parser/package.xml
index f4ee91a..45d4c26 100644
--- a/collada_parser/package.xml
+++ b/collada_parser/package.xml
@@ -12,20 +12,20 @@
   <author>Kei Okada</author>
   <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
   <license>BSD</license>
+
   <url type="website">http://ros.org/wiki/collada_parser</url>
+  <url type="repository">https://github.com/ros/robot_model</url>
+  <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-  
-  <build_depend>collada-dom</build_depend> 
-  <build_depend>roscpp</build_depend> 
-  <build_depend>urdfdom_headers</build_depend> 
-  
-  <run_depend>collada-dom</run_depend> 
-  <run_depend>roscpp</run_depend> 
-  <run_depend>urdfdom_headers</run_depend> 
-  
-  <export>
-  </export>
-  
+
+  <build_depend>collada-dom</build_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>urdfdom_headers</build_depend>
+
+  <run_depend>collada-dom</run_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>urdfdom_headers</run_depend>
+
 </package>
 
diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml
index cf4b1fe..d140437 100644
--- a/collada_urdf/package.xml
+++ b/collada_urdf/package.xml
@@ -2,34 +2,36 @@
   <name>collada_urdf</name>
   <version>1.10.5</version>
   <description>
-
     This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents.
 
     Implements robot-specific COLLADA extensions as defined by
     http://openrave.programmingvision.com/index.php/Started:COLLADA
   </description>
+
   <author>Tim Field</author>
   <author>Rosen Diankov</author>
   <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+
   <license>BSD</license>
+
   <url type="website">http://ros.org/wiki/collada_urdf</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>angles</build_depend> 
-  <build_depend>assimp</build_depend> 
-  <build_depend>resource_retriever</build_depend> 
-  <build_depend>collada-dom</build_depend> 
-  <build_depend>collada_parser</build_depend> 
-  <build_depend>roscpp</build_depend> 
-  <build_depend>urdf</build_depend> 
+  <build_depend>angles</build_depend>
+  <build_depend>assimp</build_depend>
+  <build_depend>resource_retriever</build_depend>
+  <build_depend>collada-dom</build_depend>
+  <build_depend>collada_parser</build_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>urdf</build_depend>
 
-  <run_depend>angles</run_depend> 
-  <run_depend>assimp</run_depend> 
-  <run_depend>collada-dom</run_depend> 
-  <run_depend>collada_parser</run_depend> 
-  <run_depend>resource_retriever</run_depend> 
-  <run_depend>roscpp</run_depend> 
-  <run_depend>urdf</run_depend> 
+  <run_depend>angles</run_depend>
+  <run_depend>assimp</run_depend>
+  <run_depend>collada-dom</run_depend>
+  <run_depend>collada_parser</run_depend>
+  <run_depend>resource_retriever</run_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>urdf</run_depend>
 
 </package>
diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml
index 05af453..ec6854a 100644
--- a/kdl_parser/package.xml
+++ b/kdl_parser/package.xml
@@ -1,35 +1,35 @@
 <package>
   <name>kdl_parser</name>
   <version>1.10.5</version>
-
   <description>
-
    The Kinematics and Dynamics Library (KDL) defines a tree structure
    to represent the kinematic and dynamic parameters of a robot
    mechanism. <tt>kdl_parser</tt> provides tools to construct a KDL
    tree from an XML robot representation in either the URDf format or
    the Collada format.
-
   </description>
+
   <author email="wim@willowgarage.com">Wim Meeussen</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>  <license>BSD</license>
+  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+
+  <license>BSD</license>
+
   <url type="website">http://ros.org/wiki/kdl_parser</url>
+  <url type="repository">https://github.com/ros/robot_model</url>
+  <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>catkin</build_depend>
   <build_depend>collada_parser</build_depend>
   <build_depend>orocos_kdl</build_depend>
-  <build_depend>rosconsole</build_depend> 
-  <build_depend>roscpp</build_depend> 
-  <build_depend>urdf</build_depend> 
+  <build_depend>rosconsole</build_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>urdf</build_depend>
 
   <run_depend>collada_parser</run_depend>
   <run_depend>orocos_kdl</run_depend>
-  <run_depend>rosconsole</run_depend> 
-  <run_depend>roscpp</run_depend> 
-  <run_depend>urdf</run_depend> 
+  <run_depend>rosconsole</run_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>urdf</run_depend>
 
 </package>
-
-
diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml
index fe855ba..43d62e6 100644
--- a/resource_retriever/package.xml
+++ b/resource_retriever/package.xml
@@ -2,28 +2,31 @@
   <name>resource_retriever</name>
   <version>1.10.5</version>
   <description>
-
    This package retrieves data from url-format files such as http://,
    ftp://, package:// file://, etc., and loads the data into memory.
    The package:// url for ros packages is translated into a local
    file:// url.  The resourse retriever was initially designed to load
    mesh files into memory, but it can be used for any type of
    data. The resource retriever is based on the the libcurl library.
-
   </description>
+
   <author email="jfaust@willowgarage.com">Josh Faust</author>
   <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+
   <license>BSD</license>
+
   <url type="website">http://ros.org/wiki/resource_retriever</url>
+  <url type="repository">https://github.com/ros/robot_model</url>
+  <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
   <build_depend>curl</build_depend>
-  <build_depend>rosconsole</build_depend> 
-  <build_depend>roslib</build_depend> 
+  <build_depend>rosconsole</build_depend>
+  <build_depend>roslib</build_depend>
 
   <run_depend>curl</run_depend>
-  <run_depend>rosconsole</run_depend> 
-  <run_depend>roslib</run_depend> 
+  <run_depend>rosconsole</run_depend>
+  <run_depend>roslib</run_depend>
 
 </package>
diff --git a/robot_model/package.xml b/robot_model/package.xml
index 09fc014..cce5f2f 100644
--- a/robot_model/package.xml
+++ b/robot_model/package.xml
@@ -9,12 +9,14 @@
     object model (C++) of the robot.
   </description>
 
-  <author email="isucan@willowgarage.com">Maintained by Ioan Sucan</author>
+  <author email="isucan@willowgarage.com">Ioan Sucan</author>
   <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
 
-  <license>BSD</license>  
+  <license>BSD</license>
 
   <url type="website">http://ros.org/wiki/robot_model</url>
+  <url type="repository">https://github.com/ros/robot_model</url>
+  <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
@@ -30,10 +32,10 @@
   <run_depend>graphviz</run_depend>
   <run_depend>ivcon</run_depend>
   <run_depend>kdl_parser</run_depend>
-  <run_depend>orocos_kdl</run_depend> 
+  <run_depend>orocos_kdl</run_depend>
   <run_depend>resource_retriever</run_depend>
   <run_depend>ros</run_depend>
-  <run_depend>ros_comm</run_depend> 
+  <run_depend>ros_comm</run_depend>
   <run_depend>rosconsole_bridge</run_depend>
   <run_depend>urdf</run_depend>
   <run_depend>urdf_parser</run_depend>
@@ -42,7 +44,7 @@
   <run_depend>joint_state_publisher</run_depend>
 
   <!-- Add this dep for backward compatibility -->
-  <run_depend>robot_state_publisher</run_depend> 
+  <run_depend>robot_state_publisher</run_depend>
 
   <export>
     <metapackage/>
diff --git a/urdf/package.xml b/urdf/package.xml
index acb902a..751a1f0 100644
--- a/urdf/package.xml
+++ b/urdf/package.xml
@@ -7,22 +7,28 @@
     The code API of the parser has been through our review process and will remain
     backwards compatible in future releases.
   </description>
+
   <author>Ioan Sucan</author>
   <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+
   <license>BSD</license>
+
   <url type="website">http://ros.org/wiki/urdf</url>
+  <url type="repository">https://github.com/ros/robot_model</url>
+  <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
   <build_depend>collada_parser</build_depend>
-  <build_depend>rosconsole_bridge</build_depend> 
-  <build_depend>roscpp</build_depend> 
-  <build_depend>urdfdom</build_depend> 
-  <build_depend>urdfdom_headers</build_depend> 
+  <build_depend>rosconsole_bridge</build_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>urdfdom</build_depend>
+  <build_depend>urdfdom_headers</build_depend>
 
   <run_depend>collada_parser</run_depend>
-  <run_depend>rosconsole_bridge</run_depend> 
-  <run_depend>roscpp</run_depend> 
-  <run_depend>urdfdom</run_depend> 
-  <run_depend>urdfdom_headers</run_depend> 
+  <run_depend>rosconsole_bridge</run_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>urdfdom</run_depend>
+  <run_depend>urdfdom_headers</run_depend>
+
 </package>
diff --git a/urdf_parser/package.xml b/urdf_parser/package.xml
index e0ea1f5..fb3d94e 100644
--- a/urdf_parser/package.xml
+++ b/urdf_parser/package.xml
@@ -1,7 +1,6 @@
 <package>
   <name>urdf_parser</name>
   <version>1.10.5</version>
-
   <description>
     This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package.
 
@@ -12,13 +11,17 @@
     this parser when working with URDF robot descriptions, the
     preferred user API is found in the urdf package.
   </description>
+
   <author>Wim Meeussen</author>
   <author>John Hsu</author>
   <author>Rosen Diankov</author>
   <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+
   <license>BSD</license>
 
   <url type="website">http://ros.org/wiki/urdf_parser</url>
+  <url type="repository">https://github.com/ros/robot_model</url>
+  <url type="bugtracker">https://github.com/ros/robot_model/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>