diff --git a/hrp2-machine/Makefile b/hrp2-machine/Makefile
index 4eefc018e86cd31bafa0eadd962a5092a7d8ca9b..302de330fa14282a94fae309b587058571bfffe5 100644
--- a/hrp2-machine/Makefile
+++ b/hrp2-machine/Makefile
@@ -2,8 +2,6 @@
# Created: Olivier Stasse on Wed, 17 Jun 2015
#
VERSION= 1.0.1
-ROS_PKG= hrp2-machine
-ROS_VERSION= ${VERSION}
DISTNAME= hrp2-machine-${VERSION}
CATEGORIES= robots
MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
@@ -19,9 +17,9 @@ RESTRICTED= Redistribution of repackaged binaries not permitted
NO_PUBLIC_SRC= ${RESTRICTED}
NO_PUBLIC_BIN= ${RESTRICTED}
+CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
DYNAMIC_PLIST_DIRS+= share/doc/hrp2_machine
-
include ../../devel/ros-catkin/depend.mk
include ../../interfaces/ros-common-msgs/depend.mk
include ../../interfaces/ros-std-msgs/depend.mk
diff --git a/hrp2-machine/PLIST b/hrp2-machine/PLIST
index cf057a64513162050951f2d1e136f5fa8b7627a2..8663331407c893fc251a4d870a4d962c784cc9b7 100644
--- a/hrp2-machine/PLIST
+++ b/hrp2-machine/PLIST
@@ -1,3 +1,8 @@
+@comment Tue May 31 14:48:49 CEST 2016
+include/hrp2/machine/config.h
+include/hrp2/machine/config.hh
+include/hrp2/machine/deprecated.hh
+include/hrp2/machine/warning.hh
lib/pkgconfig/hrp2_machine.pc
share/hrp2_machine/hrp2_10.machine
share/hrp2_machine/hrp2_14.machine
diff --git a/hrp2-machine/depend.mk b/hrp2-machine/depend.mk
index b0bf90204f15219b231449b10e6e5e0a5c4818d4..4d014040fdba089cd2064b1a8b85a2004b87c288 100644
--- a/hrp2-machine/depend.mk
+++ b/hrp2-machine/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= hrp2-machine
endif
-ifeq (+,$(HRP2_MACHINE_DEPEND_MK)) # -------------------------------------------
+ifeq (+,$(HRP2_MACHINE_DEPEND_MK)) # ---------------------------------------
PREFER.hrp2-machine?= robotpkg
@@ -17,11 +17,10 @@ SYSTEM_SEARCH.hrp2-machine=\
'lib/pkgconfig/hrp2_machine.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= hrp2-machine
-ROS_DEPEND_USER+= ros-hrp2-machine
DEPEND_ABI.hrp2-machine?= hrp2-machine>=1.0.0
DEPEND_DIR.hrp2-machine?= ../../wip/hrp2-machine
-endif # HRP2_MACHINE_DEPEND_MK -------------------------------------------------
+endif # HRP2_MACHINE_DEPEND_MK ---------------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}