diff --git a/recipes-ros/nodelet-core/nodelet-core.inc b/recipes-ros/nodelet-core/nodelet-core.inc
new file mode 100644
index 0000000000000000000000000000000000000000..e387a996f2f48e3f4eec0b7d7729fc78480ea8ff
--- /dev/null
+++ b/recipes-ros/nodelet-core/nodelet-core.inc
@@ -0,0 +1,7 @@
+SRC_URI = "https://github.com/ros/nodelet_core/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
+SRC_URI[md5sum] = "840b98ace89034029569f20a2a41af05"
+SRC_URI[sha256sum] = "4cc5a76ec90b0610b794128509923beba9b6dee2cb18fdeb6fd3ecc409051262"
+
+S = "${WORKDIR}/nodelet_core-${PV}/${ROS_BPN}"
+
+inherit catkin
diff --git a/recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb b/recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb
new file mode 100644
index 0000000000000000000000000000000000000000..007212736f84ac162c880233f50b2f56751567a8
--- /dev/null
+++ b/recipes-ros/nodelet-core/nodelet-topic-tools_1.7.15.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "This package contains common nodelet tools such as a mux, demux and throttle."
+
+SECTION = "devel"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
+
+DEPENDS = "dynamic-reconfigure-native"
+
+require nodelet-core.inc
diff --git a/recipes-ros/nodelet-core/nodelet_1.7.15.bb b/recipes-ros/nodelet-core/nodelet_1.7.15.bb
index 79ecf6bde106bfa02b11886d0e050a911d3e6491..5a27a757ee569b216d159e198b08db3a4178a724 100644
--- a/recipes-ros/nodelet-core/nodelet_1.7.15.bb
+++ b/recipes-ros/nodelet-core/nodelet_1.7.15.bb
@@ -11,12 +11,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=14;endline=14;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros/nodelet_core/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
-SRC_URI[md5sum] = "840b98ace89034029569f20a2a41af05"
-SRC_URI[sha256sum] = "4cc5a76ec90b0610b794128509923beba9b6dee2cb18fdeb6fd3ecc409051262"
-
 DEPENDS = "bondcpp boost message-generation pluginlib rosconsole roscpp rospy std-msgs libtinyxml"
 
-S = "${WORKDIR}/nodelet_core-${PV}/${PN}"
-
-inherit catkin
+require nodelet-core.inc