diff --git a/move3d-studio/Makefile b/move3d-studio/Makefile
index a2cd0abaa6175f828e95637c3ad891f7250461fc..5e4e205b827f26d87085c7a91825414a8b25ff7b 100644
--- a/move3d-studio/Makefile
+++ b/move3d-studio/Makefile
@@ -9,7 +9,7 @@ PKGREVISION=		3
 
 CATEGORIES=		path
 MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=move3d-studio/}
-MASTER_REPOSITORY=	git ssh://trac.laas.fr/git/robots/move3d-studio.git
+MASTER_REPOSITORY=	git git://trac.laas.fr/robots/move3d-studio.git
 
 MAINTAINER=		biomove3dgitrepo@laas.fr
 COMMENT=		The BioMove3D development studio
@@ -35,6 +35,16 @@ PKG_OPTION_UNSET.xforms= CMAKE_ARGS+= -DMOVE3D_XFORMS=OFF
 
 PKG_SUGGESTED_OPTIONS=	qtstudio
 
+## HATP connection option
+PKG_SUPPORTED_OPTIONS+= hatp_connection
+PKG_OPTION_DESCR.hatp_connection= Enable connection to HATP for intricate task and motion planning
+
+define PKG_OPTION_SET.hatp_connection
+  CMAKE_ARGS+= -DHATP_CONNECTION=ON
+  include ../../wip/msgconnector/depend.mk
+  include ../../devel/jsoncpp/depend.mk
+endef
+
 include ../../wip/libmove3d-hri/depend.mk
 include ../../wip/libmove3d-planners/depend.mk
 include ../../wip/libmove3d/depend.mk