diff --git a/hrp2-bringup/DESCR b/hrp2-bringup/DESCR
index 346c63ec66a37c5681bc2c203b44fa17592d5cc1..fc9524e5dc364aa07d884e8911cf7d9ee10e7ce3 100644
--- a/hrp2-bringup/DESCR
+++ b/hrp2-bringup/DESCR
@@ -1 +1 @@
-The package allowing to start the SoT for HRP-2
\ No newline at end of file
+The package allowing to start the SoT for HRP-2
diff --git a/hrp2-bringup/Makefile b/hrp2-bringup/Makefile
index de818d1948fb7cfbd000bd6ee49e74757abe6e99..063f74777b91b0089d55bdc75eb09f2278a430f4 100644
--- a/hrp2-bringup/Makefile
+++ b/hrp2-bringup/Makefile
@@ -2,12 +2,10 @@
# Created: Olivier Stasse on Wed, 14 Jav 2015
#
VERSION= 1.0.5
-ROS_PKG= hrp2-bringup
-ROS_VERSION= ${VERSION}
DISTNAME= hrp2-bringup-${VERSION}
-CATEGORIES= wip
-MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-bringup
+CATEGORIES= motion
+MASTER_SITES= ${MASTER_SITE_JRL}ros/${PKGBASE}/
+MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/${PKGBASE}
MAINTAINER= gepetto@laas.fr
COMMENT= Hrp2 ros package to start HRP-2
@@ -20,12 +18,10 @@ NO_PUBLIC_BIN= ${RESTRICTED}
DYNAMIC_PLIST_DIRS+= share/doc/hrp2_bringup
-
-
-include ../hrp2-14-description/depend.mk
-include ../hrp2-machine/depend.mk
-include ../hrp2-computer-monitor/depend.mk
include ../../pkgtools/pkg-config/depend.mk
+include ../../wip/hrp2-14-description/depend.mk
+include ../../wip/hrp2-computer-monitor/depend.mk
+include ../../wip/hrp2-machine/depend.mk
include ../../mk/sysdep/cmake.mk
include ../../mk/sysdep/doxygen.mk
include ../../mk/sysdep/graphviz.mk
diff --git a/hrp2-bringup/PLIST b/hrp2-bringup/PLIST
index e9bbeec327eb6d0e33092415005cdb5e077a8b26..6fd24d69bd48ab0480947153a8f7f497123ce4de 100644
--- a/hrp2-bringup/PLIST
+++ b/hrp2-bringup/PLIST
@@ -1,3 +1,9 @@
+@comment Tue May 31 15:38:22 CEST 2016
+include/hrp2/bringup/config.h
+include/hrp2/bringup/config.hh
+include/hrp2/bringup/deprecated.hh
+include/hrp2/bringup/warning.hh
+lib/pkgconfig/hrp2_bringup.pc
share/hrp2_bringup/config/chrony/README
share/hrp2_bringup/config/chrony/chrony.conf.hrp2014c
share/hrp2_bringup/config/chrony/chrony.conf.hrp2014v
diff --git a/hrp2-bringup/depend.mk b/hrp2-bringup/depend.mk
index 60055b454f68cf65d0f4737fde3d1407dcb4d52c..38a7ab28fd28cad2a14bf9383f16e118cb509690 100644
--- a/hrp2-bringup/depend.mk
+++ b/hrp2-bringup/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hrp2-bringup
endif
-ifeq (+,$(HRP2_BRINGUP_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_BRINGUP_DEPEND_MK)) # ---------------------------------------
PREFER.hrp2-bringup?= robotpkg
@@ -17,11 +17,10 @@ SYSTEM_SEARCH.hrp2-bringup=\
'lib/pkgconfig/hrp2_bringup.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= hrp2-bringup
-ROS_DEPEND_USER+= hrp2-bringup
DEPEND_ABI.hrp2-bringup?= hrp2-bringup>=1.0.0
DEPEND_DIR.hrp2-bringup?= ../hrp2-bringup
-endif # HRP2_14_DESCRIPTION_DEPEND_MK -------------------------------------------------
+endif # HRP2_14_DESCRIPTION_DEPEND_MK --------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}