diff --git a/Makefile b/Makefile
index 3f2e1ac373bed6d2c4861b3a7f5b1601306c108a..b01ff9f23946d5d9539f47ec6a6f80334877251c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,6 @@ SUBDIR+= hpp-spline
SUBDIR+= hpp-universal-robot
SUBDIR+= hrp2-14-description
SUBDIR+= hrp2-bringup
-SUBDIR+= hrp2-computer-monitor
SUBDIR+= hrp2-dev
SUBDIR+= infuse-asn1-conversions
SUBDIR+= infuse-asn1-types
diff --git a/hrp2-bringup/Makefile b/hrp2-bringup/Makefile
index 36730d7e815739f063027dffc15d8ae04ac8338a..d72054a4ce196cc2bda6c528b410d255fe80bbe4 100644
--- a/hrp2-bringup/Makefile
+++ b/hrp2-bringup/Makefile
@@ -20,8 +20,8 @@ DYNAMIC_PLIST_DIRS+= share/doc/hrp2_bringup
include ../../pkgtools/pkg-config/depend.mk
include ../../robots/hrp2-machine/depend.mk
+include ../../sysutils/hrp2-computer-monitor/depend.mk
include ../../wip/hrp2-14-description/depend.mk
-include ../../wip/hrp2-computer-monitor/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
include ../../mk/sysdep/graphviz.mk
diff --git a/hrp2-computer-monitor/DESCR b/hrp2-computer-monitor/DESCR
deleted file mode 100644
index 753856faf222f5f701068ba99ca05d8ed31223b1..0000000000000000000000000000000000000000
--- a/hrp2-computer-monitor/DESCR
+++ /dev/null
@@ -1 +0,0 @@
-HRP-2 monitor package
diff --git a/hrp2-computer-monitor/Makefile b/hrp2-computer-monitor/Makefile
deleted file mode 100644
index 2c3d6c90450ebbb391db2f2d59394948e2457800..0000000000000000000000000000000000000000
--- a/hrp2-computer-monitor/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-# robotpkg Makefile for: robots/hrp2-computer-monitor
-# Created: Olivier Stasse on Wed, 17 Jun 2015
-#
-VERSION= 1.0.2
-DISTNAME= hrp2-computer-monitor-${VERSION}
-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
-LICENSE= openhrp-grx-license
-WRKSRC= ${WRKDIR}/hrp2_computer_monitor-${VERSION}
-
-RESTRICTED= Redistribution of repackaged binaries not permitted
-NO_PUBLIC_SRC= ${RESTRICTED}
-NO_PUBLIC_BIN= ${RESTRICTED}
-
-DYNAMIC_PLIST_DIRS+= share/doc/hrp2_computer_monitor
-
-include ../../devel/ros-catkin/depend.mk
-include ../../interfaces/ros-common-msgs/depend.mk
-include ../../interfaces/ros-std-msgs/depend.mk
-include ../../middleware/ros-comm/depend.mk
-include ../../pkgtools/pkg-config/depend.mk
-include ../../mk/sysdep/cmake.mk
-include ../../mk/sysdep/doxygen.mk
-include ../../mk/sysdep/graphviz.mk
-include ../../mk/sysdep/pdflatex.mk
-include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
-include ../../mk/robotpkg.mk
diff --git a/hrp2-computer-monitor/PLIST b/hrp2-computer-monitor/PLIST
deleted file mode 100644
index 1ff1b2d0db9109d836d094f5b6926bdd50c4985a..0000000000000000000000000000000000000000
--- a/hrp2-computer-monitor/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@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
-share/hrp2_computer_monitor/scripts/ntp_monitor.py
diff --git a/hrp2-computer-monitor/depend.mk b/hrp2-computer-monitor/depend.mk
deleted file mode 100644
index 23b58ae07f14aaaed95038568e64e41607f59c39..0000000000000000000000000000000000000000
--- a/hrp2-computer-monitor/depend.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# robotpkg depend.mk for: robots/hrp2-computer-monitor
-# Created: Olivier Stasse on Wed, 24 Jun 2015
-#
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH}+
-HRP2_COMPUTER_MONITOR_DEPEND_MK:= ${HRP2_COMPUTER_MONITOR_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+= hrp2-computer-monitor
-endif
-
-ifeq (+,$(HRP2_COMPUTER_MONITOR_DEPEND_MK)) # ------------------------------
-
-PREFER.hrp2-computer-monitor?= robotpkg
-
-SYSTEM_SEARCH.hrp2-computer-monitor=\
- 'lib/pkgconfig/hrp2_computer_monitor.pc:/Version/s/[^0-9.]//gp'
-
-DEPEND_USE+= 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 ------------------------------------
-
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/hrp2-computer-monitor/distinfo b/hrp2-computer-monitor/distinfo
deleted file mode 100644
index 60597eb64bade10f77859718a1ee94a347424252..0000000000000000000000000000000000000000
--- a/hrp2-computer-monitor/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-SHA1 (hrp2-computer-monitor-1.0.2.tar.gz) = ac228d6218f74ec721a0aebad03b8d884780d15c
-RMD160 (hrp2-computer-monitor-1.0.2.tar.gz) = a0b603c6dcb0e078cc36228630b8d4dc6e1885f8
-Size (hrp2-computer-monitor-1.0.2.tar.gz) = 89309 bytes
diff --git a/sot-hrp2/Makefile b/sot-hrp2/Makefile
index bb1ed991e0abc3fa77bd4fec2ab8b5ecd0a8dbb6..3ccc855f2e16ee8e2f8641fe50e3860d504ca36b 100644
--- a/sot-hrp2/Makefile
+++ b/sot-hrp2/Makefile
@@ -26,9 +26,9 @@ include ../../robots/hrp2-14/depend.mk
include ../../robots/hrp2-14/depend.mk
include ../../robots/hrp2-machine/depend.mk
include ../../scripts/py-sot-application/depend.mk
+include ../../sysutils/hrp2-computer-monitor/depend.mk
include ../../wip/hrp2-14-description/depend.mk
include ../../wip/hrp2-bringup/depend.mk
-include ../../wip/hrp2-computer-monitor/depend.mk
include ../../wip/sot-dyninv/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
diff --git a/sot-hrprtc-hrp2/Makefile b/sot-hrprtc-hrp2/Makefile
index 31e561c606678a5dca8c0a3bb88bda72c7180d13..0ea15a76ac85fd6fb57dd7758d182ba1fdc55cb0 100644
--- a/sot-hrprtc-hrp2/Makefile
+++ b/sot-hrprtc-hrp2/Makefile
@@ -33,9 +33,9 @@ include ../../robots/hrp2-14/depend.mk
include ../../robots/hrp2-14/depend.mk
include ../../robots/hrp2-machine/depend.mk
include ../../scripts/py-sot-application/depend.mk
+include ../../sysutils/hrp2-computer-monitor/depend.mk
include ../../wip/hrp2-14-description/depend.mk
include ../../wip/hrp2-bringup/depend.mk
-include ../../wip/hrp2-computer-monitor/depend.mk
include ../../wip/sot-dyninv/depend.mk
include ../../wip/sot-hrp2/depend.mk
include ../../mk/sysdep/cmake.mk