diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
index 4449ff2..c7daaff 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
@@ -9,8 +9,6 @@ rosbuild_link_boost(collada_urdf system)
 
 rosbuild_add_executable(urdf_to_collada src/urdf_to_collada.cpp)
 target_link_libraries(urdf_to_collada collada_urdf)
-target_link_libraries(urdf_to_collada assimp)
 
 rosbuild_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
 target_link_libraries(test_collada_writer collada_urdf)
-target_link_libraries(test_collada_writer assimp)
\ No newline at end of file
diff --git a/collada_urdf/manifest.xml b/collada_urdf/manifest.xml
index 3038471..6e38389 100644
--- a/collada_urdf/manifest.xml
+++ b/collada_urdf/manifest.xml
@@ -15,8 +15,7 @@
   <depend package="colladadom" />
   <depend package="resource_retriever" />
   <depend package="angles" />
-
-  <rosdep name="assimp"/>
+  <depend package="assimp"/>
 
   <platform os="ubuntu" version="9.04"/>
   <platform os="ubuntu" version="9.10"/>
diff --git a/stack.xml b/stack.xml
index 3ac69d2..8cf8818 100644
--- a/stack.xml
+++ b/stack.xml
@@ -10,12 +10,12 @@
   <license>BSD,GPL,MIT</license>  
   <review status="Doc reviewed" notes="2009-10-02"/>
   <url>http://ros.org/wiki/robot_model</url>
-
+  <depend stack="assimp" /> <!-- assimp -->
   <depend stack="common_msgs" /> <!-- sensor_msgs -->
   <depend stack="geometry" /> <!-- tf, angles, tf_conversions -->
   <depend stack="orocos_kinematics_dynamics" /> <!-- kdl -->
   <depend stack="ros" /> <!-- roslib -->
-  <depend stack="common_rosdeps" /> 
   <depend stack="ros_comm" /> <!-- rosconsole, rospy, roscpp -->
+  <depend stack="common_rosdeps" /> <!-- rosdeps -->
 
 </stack>