diff --git a/recipes-ros/message-generation/message-generation_0.2.9.bb b/recipes-ros/message-generation/message-generation_0.2.9.bb
index 7b0af1e..ae7df6d 100644
--- a/recipes-ros/message-generation/message-generation_0.2.9.bb
+++ b/recipes-ros/message-generation/message-generation_0.2.9.bb
@@ -3,18 +3,12 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros-gbp/message_generation-release/archive/release/message_generation/0.2.9.tar.gz;downloadfilename=message-generation_0.2.9.tar.gz"
-SRC_URI[md5sum] = "9458c88437cb9bc3f3b70dd4d67bf1f3"
-SRC_URI[sha256sum] = "c474649944ec01ad2df80dc2674d235705771cd9a9cf3794fc9490b5fe9c0d5e"
+DEPENDS = "gencpp"
 
-S = "${WORKDIR}/message_generation-release-release-message_generation-0.2.9"
+SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz"
+SRC_URI[md5sum] = "b3086fbe24cc103f412cb30d83362e36"
+SRC_URI[sha256sum] = "9ce9c5b4e995933c575f2a5cb5c4b042b39913637bca06554092a52c3bb24c12"
 
-DEPENDS = "catkin-native gencpp"
+S = "${WORKDIR}/${ROS_BPN}-${PV}"
 
-FILES_${PN} += "${libdir}/*"
-
-inherit cmake pythonnative
-
-EXTRA_OECMAKE = " \
-  -Dgencpp_DIR=${STAGING_DATADIR}/gencpp/cmake/ \
-  "
+inherit catkin