diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6494d0776810a39d5fff0ff608270968496a4cc1..0cf209df7afd63838ef1813d731e9bea279ce797 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,39 +1,20 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(mqtt_bridge)
 
-find_package(catkin REQUIRED COMPONENTS
-  rospy
-  rosbridge_library
-)
-
+find_package(catkin REQUIRED)
 catkin_python_setup()
+catkin_package()
 
-catkin_package(
-)
-
-###########
-## Build ##
-###########
-
-include_directories(
-  ${catkin_INCLUDE_DIRS}
-)
-
-#############
-## Install ##
-#############
 
 install(PROGRAMS
-  scripts/mqtt_bridge_node.py.py
+  scripts/mqtt_bridge_node.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
-install(DIRECTORY launch config
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION} USE_SOURCE_PERMISSIONS
+install(DIRECTORY launch
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
 )
 
-#############
-## Testing ##
-#############
-
-# catkin_add_nosetests(test)
+install(DIRECTORY config
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/config
+)
diff --git a/package.xml b/package.xml
index 1a1d5cabfc913dc9b2a25a0bc6b598442a88fdd7..d5df5a513cb1c78561d0413a2c308dececb03554 100644
--- a/package.xml
+++ b/package.xml
@@ -12,8 +12,8 @@
   <url type="website">https://bitbucket.org/groove-x/mqtt_bridge</url>
 
   <buildtool_depend>catkin</buildtool_depend>
-  <depend>rospy</depend>
-  <depend>rosbridge_library</depend>
+  <exec_depend>rospy</exec_depend>
+  <exec_depend>rosbridge_library</exec_depend>
   <exec_depend>std_msgs</exec_depend>
 
   <export>