diff --git a/dev-ros/roscpp/roscpp-1.13.0.ebuild b/dev-ros/roscpp/roscpp-1.13.0.ebuild
index 786f85410752f..277ba479468ad 100644
--- a/dev-ros/roscpp/roscpp-1.13.0.ebuild
+++ b/dev-ros/roscpp/roscpp-1.13.0.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/roscpp/roscpp-9999.ebuild b/dev-ros/roscpp/roscpp-9999.ebuild
index 786f85410752f..277ba479468ad 100644
--- a/dev-ros/roscpp/roscpp-9999.ebuild
+++ b/dev-ros/roscpp/roscpp-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin