diff --git a/dev-ros/rosbridge_server/files/backports-ssl.patch b/dev-ros/rosbridge_server/files/backports-ssl.patch
new file mode 100644
index 0000000000000..b8fc226bde0cb
--- /dev/null
+++ b/dev-ros/rosbridge_server/files/backports-ssl.patch
@@ -0,0 +1,13 @@
+Index: rosbridge_server/setup.py
+===================================================================
+--- rosbridge_server.orig/setup.py
++++ rosbridge_server/setup.py
+@@ -11,8 +11,6 @@ from catkin_pkg.python_setup import gene
+ d = generate_distutils_setup(
+     packages=[
+         'rosbridge_server',
+-        'backports',
+-        'backports.ssl_match_hostname',
+         'tornado',
+         'tornado.platform'
+     ],
diff --git a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
similarity index 85%
rename from dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
rename to dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
index 997490d73c419..cc30070be3721 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-0.7.13.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-0.7.13-r1.ebuild
@@ -20,5 +20,7 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/rosauth[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/backports-ssl.patch" )
diff --git a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
index 997490d73c419..cc30070be3721 100644
--- a/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
+++ b/dev-ros/rosbridge_server/rosbridge_server-9999.ebuild
@@ -20,5 +20,7 @@ RDEPEND="
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/rosbridge_library[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/rosauth[${PYTHON_USEDEP}]
+	dev-python/backports-ssl-match-hostname[${PYTHON_USEDEP}]
 	"
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/backports-ssl.patch" )