diff --git a/collada_parser/package.xml b/collada_parser/package.xml
index df9211c..14cd277 100644
--- a/collada_parser/package.xml
+++ b/collada_parser/package.xml
@@ -10,7 +10,7 @@
   </description>
   <author>Rosen Diankov</author>
   <author>Kei Okada</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+  <maintainer email="isucan@gmail.com">Ioan Sucan</maintainer>
   <license>BSD</license>
 
   <url type="website">http://ros.org/wiki/collada_parser</url>
diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml
index b12c675..1fc5870 100644
--- a/collada_urdf/package.xml
+++ b/collada_urdf/package.xml
@@ -10,7 +10,7 @@
 
   <author>Tim Field</author>
   <author>Rosen Diankov</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+  <maintainer email="isucan@gmail.com">Ioan Sucan</maintainer>
 
   <license>BSD</license>
 
diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt
index 3b8ff1d..393604d 100644
--- a/kdl_parser/CMakeLists.txt
+++ b/kdl_parser/CMakeLists.txt
@@ -21,6 +21,7 @@ catkin_package(
   LIBRARIES ${PROJECT_NAME}
   INCLUDE_DIRS include
   CATKIN_DEPENDS roscpp rosconsole urdf
+  DEPENDS orocos_kdl TinyXML
 )
 
 add_library(${PROJECT_NAME} src/kdl_parser.cpp)
diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml
index 4262212..7d422ab 100644
--- a/kdl_parser/package.xml
+++ b/kdl_parser/package.xml
@@ -9,7 +9,7 @@
   </description>
 
   <author email="wim@willowgarage.com">Wim Meeussen</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+  <maintainer email="isucan@gmail.com">Ioan Sucan</maintainer>
 
   <license>BSD</license>
 
diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml
index 7466328..bac36ef 100644
--- a/resource_retriever/package.xml
+++ b/resource_retriever/package.xml
@@ -11,7 +11,7 @@
   </description>
 
   <author email="jfaust@willowgarage.com">Josh Faust</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+  <maintainer email="isucan@gmail.com">Ioan Sucan</maintainer>
 
   <license>BSD</license>
 
diff --git a/robot_model/package.xml b/robot_model/package.xml
index ea94eb5..ee2769e 100644
--- a/robot_model/package.xml
+++ b/robot_model/package.xml
@@ -9,8 +9,8 @@
     object model (C++) of the robot.
   </description>
 
-  <author email="isucan@willowgarage.com">Ioan Sucan</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+  <author email="isucan@gmail.com">Ioan Sucan</author>
+  <maintainer email="isucan@gmail.com">Ioan Sucan</maintainer>
 
   <license>BSD</license>
 
diff --git a/urdf/package.xml b/urdf/package.xml
index c9a0b8c..609a3f2 100644
--- a/urdf/package.xml
+++ b/urdf/package.xml
@@ -9,7 +9,7 @@
   </description>
 
   <author>Ioan Sucan</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+  <maintainer email="isucan@gmail.com">Ioan Sucan</maintainer>
 
   <license>BSD</license>
 
diff --git a/urdf_parser_plugin/package.xml b/urdf_parser_plugin/package.xml
index d1af727..dbf6e48 100644
--- a/urdf_parser_plugin/package.xml
+++ b/urdf_parser_plugin/package.xml
@@ -5,8 +5,8 @@
     This package contains a C++ base class for URDF parsers.
   </description>
 
-  <author email="isucan@willowgarage.com">Ioan Sucan</author>
-  <maintainer email="isucan@willowgarage.com">Ioan Sucan</maintainer>
+  <author email="isucan@gmail.com">Ioan Sucan</author>
+  <maintainer email="isucan@gmail.com">Ioan Sucan</maintainer>
 
   <license>BSD</license>