diff --git a/openhrp3-simulator-wo-rtm/Makefile b/openhrp3-simulator-wo-rtm/Makefile
index e7b4628e09d1732ea44b87da91d6eb571e860fb8..46b9dfd790a2e998e69d043b8ee941ff238ca4a7 100644
--- a/openhrp3-simulator-wo-rtm/Makefile
+++ b/openhrp3-simulator-wo-rtm/Makefile
@@ -1,15 +1,20 @@
 # robotpkg Makefile for:	simulation/openhrp3-simulator-wo-rtm
 # Created:			Olivier Stasse on Thursday, 25 Aug 2016
 #
+
+ORG=			stack-of-tasks
+NAME=			openhrp3-simulator-wo-rtm
 VERSION=		1.2.0
-PKGNAME=		openhrp3-simulator-wo-rtm-${VERSION}
-DISTNAME=		$(subst -,_,${PKGBASE})-${VERSION}
-#PKGREVISION=		3
 
-CATEGORIES=		simulation
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=openhrp3-simulator-wo-rtm/}
-MASTER_REPOSITORY=      ${MASTER_REPOSITORY_GITHUB}/olivier-stasse/openhrp3-simulator-wo-rtm
+ROSNAME=		$(subst -,_,${NAME})
+DISTNAME=		${ROSNAME}-${VERSION}
+PKGNAME=		${NAME}-${VERSION}
+
+MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}
+CHECKOUT_VCS_OPTS+=	--recursive
 
+CATEGORIES=		simulation
 MAINTAINER=		ostasse@laas.fr
 COMMENT=		OpenHRP-3 Simulator without RTM
 LICENSE=		eclipse
@@ -18,6 +23,8 @@ USE_BOOST_LIBS=		thread
 
 CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
 
+DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
+
 include ../../graphics/gepetto-viewer/depend.mk
 include ../../devel/ros-catkin/depend.mk
 include ../../devel/ros-roscpp-core/depend.mk