diff --git a/sot-tools-v3/Makefile b/sot-tools-v3/Makefile
index c0fad7234a909f99adf1ff7e368c29ef8739bf05..19f6f772e3261c173a57b88dede13cc0e6f40736 100644
--- a/sot-tools-v3/Makefile
+++ b/sot-tools-v3/Makefile
@@ -4,31 +4,27 @@
 
 ORG=			stack-of-tasks
 NAME=			sot-tools
-VERSION=		2.0.3
+VERSION=		2.1.0
 
 DISTNAME=		${NAME}-${VERSION}
 PKGNAME=		${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}.git
 CHECKOUT_VCS_OPTS+=	--recursive
 
-MAINTAINER=		gepetto@laas.fr
 CATEGORIES=		wip
-LICENSE=		gnu-lgpl-v3
-COMMENT=		tools for wip/sot-core-v3 package
+COMMENT=		tools for the sot-core package
+LICENSE=		2-clause-bsd
+MAINTAINER=		gepetto-soft@laas.fr
 
-CONFLICTS+=		sot-tools-v3-[0-9]*
-CONFLICTS+=		sot-tools-[0-9]*
-DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
+CONFLICTS+=		${NAME}
 
+CMAKE_ARGS+=		-DBUILD_PYTHON_INTERFACE=OFF
 CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
 CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=OFF  # doxygen segfaults on 14.04
-CMAKE_ARGS+=		-DBUILD_PYTHON_INTERFACE=OFF
 
-# disable -Werror, some warnings from boost-filesystem (1.50, netbsd) cannot be
-# fixed here
-CMAKE_ARGS+=		-DCXX_DISABLE_WERROR=yes
+DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
 
 include ../../wip/sot-core-v3/depend.mk
 include ../../pkgtools/pkg-config/depend.mk
diff --git a/sot-tools-v3/distinfo b/sot-tools-v3/distinfo
index c725824421534c38d899b65bea8711f46d27871e..a91ec84cba0c1d9fa00a191f2e692b4118b7fad6 100644
--- a/sot-tools-v3/distinfo
+++ b/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