diff --git a/hrp2-machine/Makefile b/hrp2-machine/Makefile
index 945b126030f011d518afa9520bfdb3e996285c52..4eefc018e86cd31bafa0eadd962a5092a7d8ca9b 100644
--- a/hrp2-machine/Makefile
+++ b/hrp2-machine/Makefile
@@ -3,10 +3,8 @@
#
VERSION= 1.0.1
ROS_PKG= hrp2-machine
-ROS_VERSION= ${ROS_PKG}-${VERSION}
-DISTNAME= hrp2-machine
-PKGNAME= hrp2-machine
-WRKSRC= ${WRKDIR}/hrp2_machine-${VERSION}
+ROS_VERSION= ${VERSION}
+DISTNAME= hrp2-machine-${VERSION}
CATEGORIES= robots
MASTER_SITES= ${MASTER_SITE_JRL}ros/${ROS_PKG}/
MASTER_REPOSITORY= ${MASTER_REPOSITORY_JRL}robots/ros-hrp2/hrp2-machine
@@ -15,6 +13,8 @@ MAINTAINER= gepetto@laas.fr
COMMENT= Hrp2 machine description
LICENSE= openhrp-grx-license
+WRKSRC= ${WRKDIR}/hrp2_machine-${VERSION}
+
RESTRICTED= Redistribution of repackaged binaries not permitted
NO_PUBLIC_SRC= ${RESTRICTED}
NO_PUBLIC_BIN= ${RESTRICTED}
@@ -22,8 +22,6 @@ NO_PUBLIC_BIN= ${RESTRICTED}
DYNAMIC_PLIST_DIRS+= share/doc/hrp2_machine
-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
diff --git a/hrp2-machine/depend.mk b/hrp2-machine/depend.mk
index 4cfc96d0b25be713c0e84f961967f1244b3cc2dc..b0bf90204f15219b231449b10e6e5e0a5c4818d4 100644
--- a/hrp2-machine/depend.mk
+++ b/hrp2-machine/depend.mk
@@ -17,7 +17,7 @@ SYSTEM_SEARCH.hrp2-machine=\
'lib/pkgconfig/hrp2_machine.pc:/Version/s/[^0-9.]//gp'
DEPEND_USE+= hrp2-machine
-ROS_DEPEND_USER+= hrp2-machine
+ROS_DEPEND_USER+= ros-hrp2-machine
DEPEND_ABI.hrp2-machine?= hrp2-machine>=1.0.0
DEPEND_DIR.hrp2-machine?= ../../wip/hrp2-machine
diff --git a/hrp2-machine/distinfo b/hrp2-machine/distinfo
index c2e17820d58888b309168a5924403a8c43e37414..4855e646d1ff5c6065d56ccc5db3d934ac404439 100644
--- a/hrp2-machine/distinfo
+++ b/hrp2-machine/distinfo
@@ -1,3 +1,3 @@
-SHA1 (ros/hrp2-machine/hrp2-machine-1.0.1.tar.gz) = b23cfae99f7f5fa95fc3452f9a4a74b500bd85d7
-RMD160 (ros/hrp2-machine/hrp2-machine-1.0.1.tar.gz) = 05aa933781416f3e96960d810fcf2e580be1cc8a
-Size (ros/hrp2-machine/hrp2-machine-1.0.1.tar.gz) = 723268 bytes
+SHA1 (hrp2-machine-1.0.1.tar.gz) = b23cfae99f7f5fa95fc3452f9a4a74b500bd85d7
+RMD160 (hrp2-machine-1.0.1.tar.gz) = 05aa933781416f3e96960d810fcf2e580be1cc8a
+Size (hrp2-machine-1.0.1.tar.gz) = 723268 bytes