diff --git a/dev-ros/test_nodelet/Manifest b/dev-ros/test_nodelet/Manifest
index afd16342c2318..6cff7929ee616 100644
--- a/dev-ros/test_nodelet/Manifest
+++ b/dev-ros/test_nodelet/Manifest
@@ -1,4 +1,5 @@
 DIST nodelet_core-1.9.10.tar.gz 40999 SHA256 50b8b3c01b577c8d71c92ec64ae516e030e2912bc5afcf66b2ada8bc39002544 SHA512 085967e37ac1ab596f5865f1b188817c774634e9a73b0b157c6125e124a3267837cd3f251d8fa93507233d8938432c4b6f9b6c6409fe0857168146ffff8c9b7b WHIRLPOOL e310bb0b4bf431936a88dd515fd2baee550c3df09a87777d7fcc86f7a72d5dafde99dfe7a9e49d9802c76aeca18c79cfc73db93da57dee65edcca7eaaa7450df
 DIST nodelet_core-1.9.11.tar.gz 43718 SHA256 d005255071e5db2dd7ee06e625c058d3b8086fba277e8aba0825841c34ab12d8 SHA512 ec1e9e3c16b8ec407dc72d439b3f292dc67e581c5f62da67a2f26b66fdd3e50636362cb34c319552adfb122451340d6b57d4ec22c09a6b0ad275ab1e61dbfdf4 WHIRLPOOL 18e3303c2f7f4c544a9d91c6cf27aefcd473ea2d4fe9c5e76db35d11d933dadd5b31892e444e868f1d3446246b324910eef5141adebad5e52f6eed720f2faa90
 DIST nodelet_core-1.9.12.tar.gz 43806 SHA256 979de1c97dd3e8f62db49a41783e2bbc4d869492cd1506711f28ed539131c3c1 SHA512 7c8ddb63dc53b6e8427065865d1a44737a9aa4445376f38a80d86f4acc45e10ec90b01df3856d7f360665756e80eb4cd10a064c44c889b767f778f9cbfec4ba7 WHIRLPOOL ee2482f6bbf765eff364ac713ebcd54ccb2d6111a350494cfabe9dee650d380fcef50eeffd279efec3ecdea295e4d18abe29d1a7a5a27d04395e0144f213db1c
+DIST nodelet_core-1.9.13.tar.gz 43864 SHA256 003ce5ac5d58ef797c90eadae6506cfceaa2fc82b792c159b0502381eb3e25c3 SHA512 a5c7c53baaff26e1cc2895b90642489d108128c44755f53298077c0cf2bb3edaa24a1df5bdb864cca6b1c180a9f532a30494c975b0073997b6df7634aa7b5d83 WHIRLPOOL ff35c012c10f333f1a2be8d234956e647a7f5a244d956cfe3ee892b2d23889fbce439847a46ed0d18d5178804757eebb31e941c2709c81886ba810fbd8848c2d
 DIST nodelet_core-1.9.9.tar.gz 40763 SHA256 1b6a4676007f3c677c09a6ceb9eac553e47a0c09c38e320d652946d52f3b9ab4 SHA512 b8a58d5ac28f989c2d877982a64e1255330db6f0e33f74e3bdf8d0e5f9957a745eb3c5b02ec285cddfbfc9d899e0e17cdf1e0ec026b3f8130571d12406e9e197 WHIRLPOOL f3a17b4cd107c24713a92ef58216e30cf3790499ec4387e0588e4e19f65d7fc3e9f08e7f54b0b69d644dfbac913cf5d7116bfd911f93ed533a7b89c5cb38d40e
diff --git a/dev-ros/test_nodelet/test_nodelet-1.9.13.ebuild b/dev-ros/test_nodelet/test_nodelet-1.9.13.ebuild
new file mode 100644
index 0000000000000..417f82f9839ed
--- /dev/null
+++ b/dev-ros/test_nodelet/test_nodelet-1.9.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/nodelet_core"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelet unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/nodelet
+		dev-ros/pluginlib
+		dev-ros/rostest
+		dev-libs/boost
+		dev-cpp/gtest
+		dev-ros/rosbash
+	)
+"
+PATCHES=( "${FILESDIR}/gcc6.patch" )