diff --git a/recipes-ros/geometric-shapes/geometric-shapes/0001-check-for-CATKIN_ENABLE_TESTING.patch b/recipes-ros/geometric-shapes/geometric-shapes/0001-check-for-CATKIN_ENABLE_TESTING.patch
new file mode 100644
index 0000000000000000000000000000000000000000..1830d6a6f65a4deb99092c640482d05e07e69f87
--- /dev/null
+++ b/recipes-ros/geometric-shapes/geometric-shapes/0001-check-for-CATKIN_ENABLE_TESTING.patch
@@ -0,0 +1,43 @@
+From 597828ebc85f552fd38537664cbe72c1c775049b Mon Sep 17 00:00:00 2001
+From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
+Date: Sun, 13 Oct 2013 05:41:53 +0200
+Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+
+---
+ CMakeLists.txt | 6 ++++--
+ package.xml    | 2 +-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4b41961..821f929 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,8 +64,10 @@ add_library(${PROJECT_NAME}
+ target_link_libraries(${PROJECT_NAME} ${ASSIMP_LIBRARIES} ${QHULL_LIBRARIES} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+ 
+ 
+-# Unit tests
+-add_subdirectory(test)
++if(CATKIN_ENABLE_TESTING)
++  # Unit tests
++  add_subdirectory(test)
++endif()
+ 
+ install(TARGETS ${PROJECT_NAME}
+         ARCHIVE DESTINATION lib
+diff --git a/package.xml b/package.xml
+index 4001019..4dbd6d1 100644
+--- a/package.xml
++++ b/package.xml
+@@ -8,7 +8,7 @@
+   <license>BSD</license>  
+   <url>http://ros.org/wiki/geometric_shapes</url>
+ 
+-  <buildtool_depend>catkin</buildtool_depend>
++  <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
+ 
+   <build_depend>boost</build_depend>
+   <build_depend>shape_msgs</build_depend>
+-- 
+1.8.1.2
+
diff --git a/recipes-ros/geometric-shapes/geometric-shapes_0.3.5.bb b/recipes-ros/geometric-shapes/geometric-shapes_0.3.5.bb
new file mode 100644
index 0000000000000000000000000000000000000000..4c3f51fedcb6852504f4fe9d7425faa9784d73b9
--- /dev/null
+++ b/recipes-ros/geometric-shapes/geometric-shapes_0.3.5.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "This package contains generic definitions of geometric shapes and bodies."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=5ee5b8b046ae48ad94a2037ca953a67b"
+
+DEPENDS = "boost shape-msgs shape-tools octomap assimp libeigen qhull console-bridge random-numbers eigen-stl-containers resource-retriever"
+
+SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI[md5sum] = "7b7b803890baf1a5f27264a2906e3d9c"
+SRC_URI[sha256sum] = "a26443007e39c7c6355c83d703df04969e8b60b7e44d851f44df026e168243c7"
+
+SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=1"
+
+S = "${WORKDIR}/${ROS_SP}"
+
+inherit catkin
diff --git a/recipes-ros/octomap/octomap.inc b/recipes-ros/octomap/octomap.inc
new file mode 100644
index 0000000000000000000000000000000000000000..774e89d987136f7344427120a480572626b54ff6
--- /dev/null
+++ b/recipes-ros/octomap/octomap.inc
@@ -0,0 +1,9 @@
+SRC_URI = "https://github.com/OctoMap/${ROS_SPN}/archive/v${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI[md5sum] = "b4ea2f354e286c48263543dac42cf555"
+SRC_URI[sha256sum] = "c68b75913ea5ebeb5459eaf2114801477aeaa2a584b018b8816f8a510150e76e"
+
+S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
+
+inherit cmake ros
+
+ROS_SPN = "octomap"
diff --git a/recipes-ros/octomap/octomap_1.6.1.bb b/recipes-ros/octomap/octomap_1.6.1.bb
new file mode 100644
index 0000000000000000000000000000000000000000..bc05817fbe90615c25c956b39d3b32e683dc89a8
--- /dev/null
+++ b/recipes-ros/octomap/octomap_1.6.1.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=9b0e1f01a68f441eeaf7b5e18812d3c8"
+
+require octomap.inc
diff --git a/recipes-ros/robot-model/collada-urdf_1.10.15.bb b/recipes-ros/robot-model/collada-urdf_1.10.15.bb
new file mode 100644
index 0000000000000000000000000000000000000000..696eaf6dfff3b104ce496d1ea7d2de282ccd61d7
--- /dev/null
+++ b/recipes-ros/robot-model/collada-urdf_1.10.15.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents."
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=15;endline=15;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = "angles assimp resource-retriever collada-dom collada-parser roscpp urdf geometric-shapes"
+
+require robot-model.inc
+
+do_configure_append() {
+	for f in collada_urdf.dir urdf_to_collada.dir
+	do 
+	sed -i -e 's: /usr/lib/liboctomap.so: ${STAGING_LIBDIR}/liboctomap.so:g' \
+	  -e 's: /usr/lib/liboctomath.so: ${STAGING_LIBDIR}/liboctomath.so:g' \
+	  ${S}/build/CMakeFiles/$f/build.make
+	done
+}