diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index 5710b2994fc13..b523c3a28fa92 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -6,3 +6,4 @@ DIST mavros-0.16.3.tar.gz 193665 SHA256 aa7ae69910fc7d22b2c46b2fc16675d8fee4d7cb
 DIST mavros-0.16.4.tar.gz 195958 SHA256 32befaf43f326d2eab2e1102346e30588b09a626837b643878ea1e1955d954cf SHA512 d2606671fab43cc9a4daf678d02286a2f31a0688c8ea327163f2dc06928bf640f425bca2bcfe2cb51a0d7aa108cca2dfbaa819deeaf56bbc9cfb784b4f0a4951 WHIRLPOOL 5a5f9e0243d4d04f16911214d40061464471df418e30e7a7cc099c7b82c429f16c2dc10432d3184f856fc23612161a574173e78c47d9462d9feefdc403414cb8
 DIST mavros-0.16.5.tar.gz 195946 SHA256 9b14de0d3144eb8064883cbee1d8db89887406584ca85f04e0b3d1f29d774d70 SHA512 69adfac236cb14d09a9f25f3dcd446cf91ed7c378339db8c9a6050835bf78c9aaf204b753b3147f0d99f716fb0ce003a58cd378909ef4fbf725737c58e74e962 WHIRLPOOL c8462c908dafc86a1489166c59295331513c277ae839032d31daae024901b45bbddef1b2cc779caab977c57b32cf949197e44cc291952abfc690d34747b9c539
 DIST mavros-0.16.6.tar.gz 196455 SHA256 49085cb4175aa398cba69f1ccce3e6cd2d542d16a440ba71f6aacca97467ba8c SHA512 58d7b4f2d69cac40bd009d2b86e571ff25c23ca52e56a455989f0c6aa34d32725285a62df57e4065887841eaf93649c9c0d167f3c7c937c2e06e95d489b39e31 WHIRLPOOL 9be567311269caeab75e9ba4893f1ea5148bdd576176cd3ff248558c9821a41c4cb87afc91d8ee8f2b45df5d93bf1d1ff865affd83855c5fa3e2b3cf9b5eeabc
+DIST mavros-0.17.0.tar.gz 199754 SHA256 7bbafed3e7192875207499ad4c678356de29c1ab748c3f30ae02e71fdca7efff SHA512 e853596662f50b7ecea2bf7c503d56cb77d05e0ec37cb76f045511e271fb9a76adf0d642960164dd5aa94ffa70ff80661a663c74ecf228dca01f8bc63be3dc0c WHIRLPOOL 38a69ae71a00955b19a8f86101b886361fc321d6463119162203bda944ab96d56142d997cc5cd15ad8421b68b22ec9ba8f4bb481682d77ce7141f4198c555fd6
diff --git a/dev-ros/mavros_extras/mavros_extras-0.17.0.ebuild b/dev-ros/mavros_extras/mavros_extras-0.17.0.ebuild
new file mode 100644
index 0000000000000..5622813985527
--- /dev/null
+++ b/dev-ros/mavros_extras/mavros_extras-0.17.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/mavlink/mavros"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Extra nodes and plugins for mavros"
+LICENSE="GPL-3 LGPL-3 BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/image_transport
+	dev-ros/cv_bridge
+	dev-ros/mavros
+	dev-ros/roscpp
+	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}"