diff --git a/py-sot-tools-v3/Makefile b/py-sot-tools-v3/Makefile
index 6e187560e51d37224fdb0e675dbb0c05d05247c2..7d6e68d457b45291c5bb2dee3d20e9e484551c45 100644
--- a/py-sot-tools-v3/Makefile
+++ b/py-sot-tools-v3/Makefile
@@ -4,36 +4,30 @@
 
 ORG=			stack-of-tasks
 NAME=			sot-tools
-VERSION=		2.0.3
+VERSION=		2.1.0
 
 DISTNAME=		${NAME}-${VERSION}
 PKGNAME=		${PKGTAG.python-}${NAME}-v3-${VERSION}
 
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}-v3/}
-MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git
+MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
+MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}
 CHECKOUT_VCS_OPTS+=	--recursive
 
-MAINTAINER=		gepetto@laas.fr
 CATEGORIES=		wip
-LICENSE=		gnu-lgpl-v3
-COMMENT=		Python tools for wip/sot-core-v3 package
+COMMENT=		tools for the sot-core package (python bindings)
+LICENSE=		2-clause-bsd
+MAINTAINER=		gepetto-soft@laas.fr
 
-CONFLICTS+=		py[0-9][0-9]-sot-tools-v3-[0-9]*
-CONFLICTS+=		py[0-9][0-9]-sot-tools-[0-9]*
-DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
+CONFLICTS+=		py[0-9][0-9]-${NAME}
 
 CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
 CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=OFF  # doxygen segfaults on 14.04
 
-# disable -Werror, some warnings from boost-filesystem (1.50, netbsd) cannot be
-# fixed here
-CMAKE_ARGS+=		-DCXX_DISABLE_WERROR=yes
-
-DEPEND_ABI.python+=	python<3
+DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
 
+include ../../${CATEGORIES}/${NAME}-v3/depend.mk
 include ../../wip/sot-core-v3/depend.mk
-#include ../../wip/py-sot-core-v3/depend.mk TODO
-include ../../wip/sot-tools-v3/depend.mk
+include ../../wip/py-sot-core-v3/depend.mk
 include ../../pkgtools/pkg-config/depend.mk
 include ../../mk/sysdep/cmake.mk
 include ../../mk/sysdep/doxygen.mk
diff --git a/py-sot-tools-v3/depend.mk b/py-sot-tools-v3/depend.mk
index 35c6c1dd24ec4f5bd9c1ee8c3417984289bcc9f6..6d80d622e2c83e64e9d8dab90cda4be2d2b9027c 100644
--- a/py-sot-tools-v3/depend.mk
+++ b/py-sot-tools-v3/depend.mk
@@ -18,7 +18,7 @@ DEPEND_ABI.py-sot-tools-v3?=	${PKGTAG.python-}sot-tools-v3>=2.0
 DEPEND_DIR.py-sot-tools-v3?=	../../wip/py-sot-tools-v3
 
 SYSTEM_SEARCH.py-sot-tools-v3=\
-	'${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/tools/__init__.py'
+	'${PYTHON_SYSLIBSEARCH}/dynamic_graph/sot/tools/wrap.so'
 
 include ../../mk/sysdep/python.mk
 
diff --git a/py-sot-tools-v3/distinfo b/py-sot-tools-v3/distinfo
index c725824421534c38d899b65bea8711f46d27871e..a91ec84cba0c1d9fa00a191f2e692b4118b7fad6 100644
--- a/py-sot-tools-v3/distinfo
+++ b/py-sot-tools-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (sot-tools-2.0.3.tar.gz) = 79e8d8cafe46dd6f0ac2d2b1359bd7f4a71876b6
-RMD160 (sot-tools-2.0.3.tar.gz) = 94bf65858d95f43fa489361c1d8e5156fbb10ba2
-Size (sot-tools-2.0.3.tar.gz) = 781844 bytes
+SHA1 (sot-tools-2.1.0.tar.gz) = 2dece4ca732f3985859de73780af30f20b9d23e9
+RMD160 (sot-tools-2.1.0.tar.gz) = 79ba16219d6bd1ae1d2475ac88a8d0a189a4dacf
+Size (sot-tools-2.1.0.tar.gz) = 784202 bytes