diff --git a/create_package_pubsub/catkin_ws/src/beginner_tutorials/CMakeLists.txt b/create_package_pubsub/catkin_ws/src/beginner_tutorials/CMakeLists.txt
index 6f61633..8536de0 100644
--- a/create_package_pubsub/catkin_ws/src/beginner_tutorials/CMakeLists.txt
+++ b/create_package_pubsub/catkin_ws/src/beginner_tutorials/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.8.3)
 project(beginner_tutorials)
 
 ## Find catkin and any catkin packages
-find_package(catkin REQUIRED COMPONENTS roscpp rospy std_msgs genmsg)
+find_package(catkin REQUIRED COMPONENTS roscpp rospy std_msgs message_generation)
 
 ## Declare ROS messages and services
 add_message_files(FILES Num.msg)
@@ -20,10 +20,10 @@ include_directories(include ${catkin_INCLUDE_DIRS})
 
 add_executable(talker src/talker.cpp)
 target_link_libraries(talker ${catkin_LIBRARIES})
-add_dependencies(talker beginner_tutorials_generate_messages_cpp)
+add_dependencies(talker ${catkin_EXPORTED_TARGETS})
 
 add_executable(listener src/listener.cpp)
 target_link_libraries(listener ${catkin_LIBRARIES})
-add_dependencies(listener beginner_tutorials_generate_messages_cpp)
+add_dependencies(listener ${catkin_EXPORTED_TARGETS})
 
 # %EndTag(FULLTEXT)%