diff --git a/morse-ros/Makefile b/morse-ros/Makefile
index 7ea7dfaa6ce9286d78c152e95f9cf085a9feb4ca..5bacc91fe0b378e5a64e599b4eac9a3620259fea 100644
--- a/morse-ros/Makefile
+++ b/morse-ros/Makefile
@@ -15,11 +15,11 @@ CMAKE_ARGS+=		-DBUILD_ROS_SUPPORT=ON
 CMAKE_ARGS+=		-DBUILD_YARP_SUPPORT=OFF
 CMAKE_ARGS+=		-DBUILD_MOOS_SUPPORT=OFF
 CMAKE_ARGS+=		-DBUILD_HLA_SUPPORT=OFF
+CMAKE_ARGS+=		-DBUILD_MAVLINK_SUPPORT=OFF
 CMAKE_ARGS+= 		-DPYMORSE_SUPPORT=OFF
 
 #include ../../interfaces/ros-common-msgs/depend.mk
 include ../../wip/py-yaml/depend.mk
-include ../../sysutils/py-rospkg/depend.mk
 include ../../sysutils/py-catkin-pkg/depend.mk
 include ../../simulation/morse/depend.mk
 include ../../mk/robotpkg.mk
diff --git a/morse-ros/PLIST b/morse-ros/PLIST
index 15bdec3420b6da710252a051382713ee4702b30a..86de395a1df9740de7c63b27afcaf5220a115c63 100644
--- a/morse-ros/PLIST
+++ b/morse-ros/PLIST
@@ -1,4 +1,4 @@
-@comment Mon May 11 09:14:36 CEST 2015
+@comment Mon Feb 8 10:23:23 CET 2016
 ${PYTHON_SITELIB}/morse/middleware/ros/__init__.py
 ${PYTHON_SITELIB}/morse/middleware/ros/abstract_ros.py
 ${PYTHON_SITELIB}/morse/middleware/ros/accelerometer.py
@@ -8,14 +8,11 @@ ${PYTHON_SITELIB}/morse/middleware/ros/depth_camera.py
 ${PYTHON_SITELIB}/morse/middleware/ros/destination.py
 ${PYTHON_SITELIB}/morse/middleware/ros/force_torque.py
 ${PYTHON_SITELIB}/morse/middleware/ros/gps.py
-${PYTHON_SITELIB}/morse/middleware/ros/helpers.py
 ${PYTHON_SITELIB}/morse/middleware/ros/imu.py
 ${PYTHON_SITELIB}/morse/middleware/ros/infrared.py
 ${PYTHON_SITELIB}/morse/middleware/ros/jido_posture.py
-${PYTHON_SITELIB}/morse/middleware/ros/jointpositions.py
 ${PYTHON_SITELIB}/morse/middleware/ros/jointstate.py
 ${PYTHON_SITELIB}/morse/middleware/ros/jointtrajectorycontrollers.py
-${PYTHON_SITELIB}/morse/middleware/ros/kuka_jointpositions.py
 ${PYTHON_SITELIB}/morse/middleware/ros/kuka_jointstate.py
 ${PYTHON_SITELIB}/morse/middleware/ros/kuka_jointstate_pub.py
 ${PYTHON_SITELIB}/morse/middleware/ros/laserscanner.py