diff --git a/hrp2-computer-monitor/DESCR b/hrp2-computer-monitor/DESCR
new file mode 100644
index 0000000000000000000000000000000000000000..753856faf222f5f701068ba99ca05d8ed31223b1
--- /dev/null
+++ b/hrp2-computer-monitor/DESCR
@@ -0,0 +1 @@
+HRP-2 monitor package
diff --git a/hrp2-computer-monitor/Makefile b/hrp2-computer-monitor/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..88e6ce74b4a0e115b2a0db71e997f7aede714d8c
--- /dev/null
+++ b/hrp2-computer-monitor/Makefile
@@ -0,0 +1,41 @@
+# robotpkg Makefile for:	robots/hrp2-computer-monitor
+# Created:			Olivier Stasse on Wed, 17 Jun 2015
+#
+VERSION=		1.0.0
+ROS_PKG=		hrp2_computer_monitor
+ROS_VERSION=		${VERSION}
+DISTNAME=		hrp2_computer_monitor
+CATEGORIES=		robots
+MASTER_SITES=		${MASTER_SITE_JRL}ros/${ROS_PKG}/
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-computer-monitor
+
+MAINTAINER=		gepetto@laas.fr
+COMMENT=		Hrp2 ros monitoring package
+LICENSE=		openhrp-grx-license
+
+RESTRICTED=	Redistribution of repackaged binaries not permitted
+NO_PUBLIC_SRC=	${RESTRICTED}
+NO_PUBLIC_BIN=	${RESTRICTED}
+
+DYNAMIC_PLIST_DIRS+=	share/doc/hrp2_computer_monitor
+
+
+include ../../meta-pkgs/ros-base/Makefile.common
+
+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
+
+CONFIGURE_ENV+=      ROS_ROOT=$(call quote,/opt/openrobots/share/ros)
+CONFIGURE_ENV+=      ROS_PACKAGE_PATH=$(call quote,/opt/openrobots/share:/opt/openrobots/stacks)
+CONFIGURE_ENV+=      ROS_MASTER_URI=$(call quote,http://localhost:11311)
+CONFIGURE_ENV+=      ROS_DISTRO=$(call quote,${PREFER.ros})
diff --git a/hrp2-computer-monitor/PLIST b/hrp2-computer-monitor/PLIST
new file mode 100644
index 0000000000000000000000000000000000000000..8bc79a4ca4cf67304cb9f81eaa624e650fd961c9
--- /dev/null
+++ b/hrp2-computer-monitor/PLIST
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000000000000000000000000000000000..8e2045f8e055b79a0c4acded98f3e6edc8cfe455
--- /dev/null
+++ b/hrp2-computer-monitor/depend.mk
@@ -0,0 +1,27 @@
+# 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 (+,$(ROMEO_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
+ROS_DEPEND_USER+=	hrp2-computer-monitor
+
+DEPEND_ABI.hrp2-computer-monitor?=	hrp2-computer-monitor>=1.0.0
+DEPEND_DIR.hrp2-computer-monitor?=	../../robots/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
new file mode 100644
index 0000000000000000000000000000000000000000..eac36cd0f21408277b20854c78c843231ca80b43
--- /dev/null
+++ b/hrp2-computer-monitor/distinfo
@@ -0,0 +1,3 @@
+SHA1 (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 88a079f41e64c0ea07984e2846fd1590cf82b9f0
+RMD160 (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 7dfb316fabb2b02010e8348a1cc8e1021e694b5b
+Size (ros/hrp2_computer_monitor/1.0.0.tar.gz) = 88890 bytes