diff --git a/CMakeLists.txt b/CMakeLists.txt
index f5e4d3671483f7e10bb9ca45b80835fb4d75ff48..f64da4b571ec0081c871c220f0374b0611d3cba2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,20 @@
 cmake_minimum_required(VERSION 3.0.2)
 project(ros_jr3_comedi)
 
-find_package(catkin REQUIRED )
+find_package(catkin REQUIRED COMPONENTS
+  roscpp
+  rospy
+  std_msgs
+  geometry_msgs
+)
+
+catkin_package(CATKIN_DEPENDS
+  roscpp
+  rospy
+  std_msgs
+  geometry_msgs
+)
 
-catkin_install_python(
-    PROGRAMS 
-      nodes/publisher
+catkin_install_python(PROGRAMS nodes/publisher
     DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
diff --git a/README.md b/README.md
index 2ef21c12c330a999864f24367c420edcd0909c5e..a882db707b7bb1a268df7c5a7f4f84a78d7452c3 100644
--- a/README.md
+++ b/README.md
@@ -4,16 +4,10 @@
 
 ```bash
 source /usr/lib64/ros/setup.bash
-source ~/catkin_ws/devel_isolated/setup.bash
 
 mkdir -p ~/catkin_ws/src
-cd ~/catkin_ws/
-
-virtualenv venv
-source venv/bin/activate
-pip install pexpect >= 4.8.0
+cd ~/catkin_ws/src
 
-cd src
 git clone https://gitlab.control.lth.se/tetov/ros_jr3_comedi.git
 
 cd ..
@@ -25,7 +19,6 @@ catkin_make_isolated
 ```bash
 source /usr/lib64/ros/setup.bash
 source ~/catkin_ws/devel_isolated/setup.bash
-source ~/catkin_ws/venv/bin/activate
 
 export ROS_MASTER_URI=http://130.235.83.121:11311
 roslaunch ros_jr3_comedi publish.launch
diff --git a/package.xml b/package.xml
index edfc5561413e43f2b544eadea39aed6f119b9fa9..41559eb21efa40ab19eabaed3393704a83898318 100644
--- a/package.xml
+++ b/package.xml
@@ -11,20 +11,16 @@
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>roscpp</build_depend>
   <build_depend>rospy</build_depend>
-  <build_depend>geometry_msg</build_depend>
+  <build_depend>geometry_msgs</build_depend>
   <build_depend>std_msgs</build_depend>
 
   <build_export_depend>roscpp</build_export_depend>
   <build_export_depend>rospy</build_export_depend>
-  <build_export_depend>geometry_msg</build_export_depend>
+  <build_export_depend>geometry_msgs</build_export_depend>
   <build_export_depend>std_msgs</build_export_depend>
 
   <exec_depend>roscpp</exec_depend>
   <exec_depend>rospy</exec_depend>
-  <exec_depend>geometry_msg</exec_depend>
+  <exec_depend>geometry_msgs</exec_depend>
   <exec_depend>std_msgs</exec_depend>
-
-  <export>
-    <pip_requirements>requirements.txt</pip_requirements>
-  </export>
 </package>