diff --git a/ros_arduino_msgs/CMakeLists.txt b/ros_arduino_msgs/CMakeLists.txt
index fea7424..ad5e695 100644
--- a/ros_arduino_msgs/CMakeLists.txt
+++ b/ros_arduino_msgs/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(ros_arduino_msgs)
 
-find_package(catkin REQUIRED message_generation std_msgs)
+find_package(catkin REQUIRED COMPONENTS std_msgs message_generation)
 
 add_message_files(FILES
                   AnalogFloat.msg
@@ -17,10 +17,9 @@ add_service_files(FILES
                   ServoWrite.srv
                  )
 
-generate_messages(DEPENDENCIES std_msgs)
-
-catkin_package(
-	DEPENDS std_msgs
-    CATKIN DEPENDS message_runtime std_msgs
-)
+generate_messages(   
+	DEPENDENCIES  
+	std_msgs  
+)  
 
+catkin_package(CATKIN_DEPENDS message_runtime std_msgs)