diff --git a/dev-ros/rqt_robot_steering/Manifest b/dev-ros/rqt_robot_steering/Manifest
index bb0da5c3c13b7..9c1c93e6f586a 100644
--- a/dev-ros/rqt_robot_steering/Manifest
+++ b/dev-ros/rqt_robot_steering/Manifest
@@ -1 +1,2 @@
 DIST rqt_robot_plugins-0.5.6.tar.gz 2107696 SHA256 d5f1b509df54b253d3b2952560e8dc5e764c3259b0e9dcff08541e27ac9fed71 SHA512 871f660e22afafd510e34984b94d2530bc3314db194c06ff458430e15b1183a60147289e9544a5fb070665a3c83034cbcccefe2f820e62f091c3bbc0edfd0a51 WHIRLPOOL a90882b1e762f5e53b7ce7ff92695ba8eb63242b53304a08c928f2667ceb206cfda72e64d81b73d1d951e6b92cb5f16327528846f6b54e28b2acaf898424a664
+DIST rqt_robot_steering-0.5.7.tar.gz 6402 SHA256 950eae6588107633f33fb075dcf4a5a3ed0466401b281d075bd386f1c9bf2b39 SHA512 1819d5f26b98c35d2d3de39e4159ffd6b1d59dd3acbea589c1c72082a62f380bc0357578931bf2279b5ec4be100b7e439390f8b62d17bbf4abeabb8bf2afafd3 WHIRLPOOL 632d56861990dc3277f31c697e438541a90042af69198be1d122f831f3e26e3b6f42bacae22f28614b99b7bdaed56c313fecc1977bbcb77ed772b0928ae849f3
diff --git a/dev-ros/rqt_robot_steering/metadata.xml b/dev-ros/rqt_robot_steering/metadata.xml
index 70d1993e28553..e4a48c12d309e 100644
--- a/dev-ros/rqt_robot_steering/metadata.xml
+++ b/dev-ros/rqt_robot_steering/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros-visualization/rqt_robot_plugins</remote-id>
+		<remote-id type="github">ros-visualization/rqt_robot_steering</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.7.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.7.ebuild
new file mode 100644
index 0000000000000..4e1e8da7698f6
--- /dev/null
+++ b/dev-ros/rqt_robot_steering/rqt_robot_steering-0.5.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_steering"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for steering a robot using Twist messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild b/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild
index f97bb87b58a18..4e1e8da7698f6 100644
--- a/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild
+++ b/dev-ros/rqt_robot_steering/rqt_robot_steering-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_plugins"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_robot_steering"
 PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
 
 inherit ros-catkin