diff --git a/std_msgs/CMakeLists.txt b/std_msgs/CMakeLists.txt
index 73d3d4f7..5bd58b60 100644
--- a/std_msgs/CMakeLists.txt
+++ b/std_msgs/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.4.6)
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 rosbuild_init()
-genmsg()
+rosbuild_genmsg()
 
diff --git a/std_srvs/CMakeLists.txt b/std_srvs/CMakeLists.txt
index bd912ddf..5fee5ffe 100644
--- a/std_srvs/CMakeLists.txt
+++ b/std_srvs/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.4.6)
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
 rosbuild_init()
-gensrv()
+rosbuild_gensrv()