diff --git a/hrp2-computer-monitor/Makefile b/hrp2-computer-monitor/Makefile
index 744bcfbbd8f576132bf03ada53fa306c9d9f60fc..d1f1fb146f930cb98083bc5084d5a73ec2bb533e 100644
--- a/hrp2-computer-monitor/Makefile
+++ b/hrp2-computer-monitor/Makefile
@@ -2,12 +2,10 @@
# Created: Olivier Stasse on Wed, 17 Jun 2015
#
VERSION= 1.0.1
-ROS_PKG= hrp2-computer-monitor
-ROS_VERSION= ${VERSION}
DISTNAME= hrp2-computer-monitor-${VERSION}
-CATEGORIES= wip
-MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-computer-monitor
+CATEGORIES= sysutils
+MASTER_SITES= ${MASTER_SITE_JRL}ros/${PKGBASE}/
+MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/${PKGBASE}
MAINTAINER= gepetto@laas.fr
COMMENT= Hrp2 ros monitoring package
diff --git a/hrp2-computer-monitor/PLIST b/hrp2-computer-monitor/PLIST
index 8bc79a4ca4cf67304cb9f81eaa624e650fd961c9..1ff1b2d0db9109d836d094f5b6926bdd50c4985a 100644
--- a/hrp2-computer-monitor/PLIST
+++ b/hrp2-computer-monitor/PLIST
@@ -1,3 +1,9 @@
+@comment Tue May 31 15:04:00 CEST 2016
+include/hrp2/computer/monitor/config.h
+include/hrp2/computer/monitor/config.hh
+include/hrp2/computer/monitor/deprecated.hh
+include/hrp2/computer/monitor/warning.hh
+lib/pkgconfig/hrp2_computer_monitor.pc
share/hrp2_computer_monitor/package.xml
share/hrp2_computer_monitor/scripts/cpu_monitor.py
share/hrp2_computer_monitor/scripts/hd_monitor.py
diff --git a/hrp2-computer-monitor/depend.mk b/hrp2-computer-monitor/depend.mk
index 7c9e2b03c8e8a988585791ce29c4037309103eab..23b58ae07f14aaaed95038568e64e41607f59c39 100644
--- a/hrp2-computer-monitor/depend.mk
+++ b/hrp2-computer-monitor/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hrp2-computer-monitor
endif
-ifeq (+,$(HRP2_COMPUTER_MONITOR_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_COMPUTER_MONITOR_DEPEND_MK)) # ------------------------------
PREFER.hrp2-computer-monitor?= robotpkg
@@ -17,11 +17,10 @@ SYSTEM_SEARCH.hrp2-computer-monitor=\
'lib/pkgconfig/hrp2_computer_monitor.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= hrp2-computer-monitor
-ROS_DEPEND_USER+= ros-hrp2-computer-monitor
DEPEND_ABI.hrp2-computer-monitor?= hrp2-computer-monitor>=1.0.0
DEPEND_DIR.hrp2-computer-monitor?= ../../wip/hrp2-computer-monitor
-endif # HRP2_COMPUTER_MONITOR_DEPEND_MK -------------------------------------------------
+endif # HRP2_COMPUTER_MONITOR_DEPEND_MK ------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}