diff --git a/collada_parser/CMakeLists.txt b/collada_parser/CMakeLists.txt
index 86fdc0a..ffed116 100644
--- a/collada_parser/CMakeLists.txt
+++ b/collada_parser/CMakeLists.txt
@@ -44,7 +44,3 @@ install(TARGETS ${PROJECT_NAME}
 
 install(DIRECTORY include/
   DESTINATION include)
-
-# for compatibility with old build system
-install(FILES manifest.xml
-        DESTINATION share/${PROJECT_NAME})
diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
index 4772125..7f5c9b0 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
@@ -61,7 +61,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS
 add_executable(urdf_to_collada src/urdf_to_collada.cpp)
 target_link_libraries(urdf_to_collada ${PROJECT_NAME})
 
-add_gtest(test_collada_writer test/test_collada_urdf.cpp)
+catkin_add_gtest(test_collada_writer test/test_collada_urdf.cpp)
 target_link_libraries(test_collada_writer ${PROJECT_NAME})
 
 install(TARGETS ${PROJECT_NAME} urdf_to_collada
diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt
index 73b1f5b..8f2a469 100644
--- a/kdl_parser/CMakeLists.txt
+++ b/kdl_parser/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${Orocos-KDL_LIBRARIES}
 add_executable(check_kdl_parser src/check_kdl_parser.cpp )
 target_link_libraries(check_kdl_parser ${PROJECT_NAME})
 
-add_gtest(test_kdl_parser test/test_kdl_parser.cpp )
+catkin_add_gtest(test_kdl_parser test/test_kdl_parser.cpp )
 target_link_libraries(test_kdl_parser ${PROJECT_NAME})
 
 # How does CATKIN do this?
@@ -39,7 +39,3 @@ install(TARGETS ${PROJECT_NAME}
 
 install(DIRECTORY include/
   DESTINATION include)
-
-# for compatibility with old build system
-install(FILES manifest.xml
-        DESTINATION share/${PROJECT_NAME})
diff --git a/resource_retriever/CMakeLists.txt b/resource_retriever/CMakeLists.txt
index 512ed4d..9bf4a36 100644
--- a/resource_retriever/CMakeLists.txt
+++ b/resource_retriever/CMakeLists.txt
@@ -28,7 +28,3 @@ install(TARGETS ${PROJECT_NAME}
 
 install(DIRECTORY include/
   DESTINATION include)
-
-# for compatibility with old build system
-install(FILES manifest.xml
-        DESTINATION share/${PROJECT_NAME})
diff --git a/resource_retriever/test/CMakeLists.txt b/resource_retriever/test/CMakeLists.txt
index 2043280..f133bf6 100644
--- a/resource_retriever/test/CMakeLists.txt
+++ b/resource_retriever/test/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR})
 
-add_gtest(${PROJECT_NAME}_utest test.cpp)
+catkin_add_gtest(${PROJECT_NAME}_utest test.cpp)
 target_link_libraries(${PROJECT_NAME}_utest ${PROJECT_NAME})
diff --git a/srdf/CMakeLists.txt b/srdf/CMakeLists.txt
index dea8e14..b14f9a3 100644
--- a/srdf/CMakeLists.txt
+++ b/srdf/CMakeLists.txt
@@ -1,6 +1,2 @@
-# for compatibility with old build system
-install(FILES manifest.xml
-        DESTINATION share/srdf)
-
 install(DIRECTORY include/
         DESTINATION include)
diff --git a/stack.xml b/stack.xml
index 9a1ee21..7eefb16 100644
--- a/stack.xml
+++ b/stack.xml
@@ -1,6 +1,6 @@
 <stack>
   <name>robot_model</name>
-  <version>1.9.5</version>
+  <version>1.9.6</version>
   <description brief="Modeling robot information">
     <tt>robot_model</tt> contains packages for modeling various
     aspects of robot information, specified in the Xml Robot
diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
index eb45257..b396401 100644
--- a/urdf/CMakeLists.txt
+++ b/urdf/CMakeLists.txt
@@ -41,7 +41,7 @@ target_link_libraries(check_urdf ${PROJECT_NAME})
 add_executable(urdf_to_graphiz src/urdf_to_graphiz.cpp)
 target_link_libraries(urdf_to_graphiz ${PROJECT_NAME})
 
-add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
+catkin_add_gtest(test_parser EXCLUDE_FROM_ALL test/test_robot_model_parser.cpp)
 target_link_libraries(test_parser ${PROJECT_NAME})
 
 # no idea how CATKIN does this
@@ -53,7 +53,3 @@ install(TARGETS ${PROJECT_NAME} check_urdf urdf_to_graphiz
 
 install(DIRECTORY include/
   DESTINATION include)
-
-# for compatibility with old build system
-install(FILES manifest.xml
-        DESTINATION share/${PROJECT_NAME})
diff --git a/urdf_interface/CMakeLists.txt b/urdf_interface/CMakeLists.txt
index 52e058f..b14f9a3 100644
--- a/urdf_interface/CMakeLists.txt
+++ b/urdf_interface/CMakeLists.txt
@@ -1,6 +1,2 @@
-# for compatibility with old build system
-install(FILES manifest.xml
-        DESTINATION share/urdf_interface)
-
 install(DIRECTORY include/
         DESTINATION include)
diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
index 9afc738..e69de29 100644
--- a/urdf_parser/CMakeLists.txt
+++ b/urdf_parser/CMakeLists.txt
@@ -1,3 +0,0 @@
-# for compatibility with old build system
-install(FILES manifest.xml
-        DESTINATION share/urdf_parser)