diff --git a/py-sot-core-v3/Makefile b/py-sot-core-v3/Makefile
index b0d4a6e970ae520aad9055482e8ed90828e20a71..34e5fbecb9662df84acbec12feb2f74158a9d9aa 100644
--- a/py-sot-core-v3/Makefile
+++ b/py-sot-core-v3/Makefile
@@ -5,14 +5,10 @@
 ORG=			stack-of-tasks
 NAME=			sot-core
 VERSION=		4.5.0
+PKGREVISION=		1
 
-DISTNAME=		${NAME}-${VERSION}
 PKGNAME=		${PKGTAG.python-}${NAME}-v3-${VERSION}
 
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}
-CHECKOUT_VCS_OPTS+=	--recursive
-
 CATEGORIES=		wip
 COMMENT=		Hierarchical task based control of humanoid robots (python bindings)
 LICENSE=		2-clause-bsd
@@ -20,11 +16,11 @@ MAINTAINER=		gepetto-soft@laas.fr
 
 CONFLICTS+=		py[0-9][0-9]-${NAME}
 
-CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
 CMAKE_ARGS+=		-DINSTALL_DOCUMENTATION=OFF
 CMAKE_ARGS+=		-DINSTALL_PYTHON_INTERFACE_ONLY=ON
 CMAKE_ARGS+=		-DPYTHON_PACKAGES_DIR="site-packages"
 
+include ../../wip/jrl-cmakemodules/Makefile.common
 include ../../${CATEGORIES}/${NAME}-v3/depend.mk
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
diff --git a/py-sot-core-v3/distinfo b/py-sot-core-v3/distinfo
index 52e64b6921b6028ab83df924f6fc7a489f35a743..882c1ac261ada8e15997d210dc28cf7429aaadff 100644
--- a/py-sot-core-v3/distinfo
+++ b/py-sot-core-v3/distinfo
@@ -1,3 +1,4 @@
 SHA1 (sot-core-4.5.0.tar.gz) = 16ede3f2fb97bffa3fbc84ca592abee48e9bd9c1
 RMD160 (sot-core-4.5.0.tar.gz) = 7ec0e92eee0ab50dac2af2a0d40f2f4afce8c79c
 Size (sot-core-4.5.0.tar.gz) = 1107245 bytes
+SHA1 (patch-aa) = d0f79fa4777967d2d114a1f83ae3c9406e572f43
diff --git a/py-sot-core-v3/patches/patch-aa b/py-sot-core-v3/patches/patch-aa
new file mode 100644
index 0000000000000000000000000000000000000000..d35d04e2eae4f6be32d412c53ee4608669a1aae7
--- /dev/null
+++ b/py-sot-core-v3/patches/patch-aa
@@ -0,0 +1,40 @@
+From 8a36be8624dd19753d115edcdb8a7e77d464a5c4 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 13 Sep 2019 13:50:57 +0200
+Subject: [PATCH]  include pinocchio before boost
+
+ref https://github.com/stack-of-tasks/pinocchio/issues/849
+---
+ include/sot/core/device.hh     | 2 ++
+ include/sot/core/robot-simu.hh | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/sot/core/device.hh b/include/sot/core/device.hh
+index f81de5ed..fe1e6693 100644
+--- include/sot/core/device.hh
++++ include/sot/core/device.hh
+@@ -13,6 +13,8 @@
+ /* --- INCLUDE --------------------------------------------------------- */
+ /* --------------------------------------------------------------------- */
+ 
++#include <pinocchio/fwd.hpp>
++
+ /* -- MaaL --- */
+ #include <dynamic-graph/linear-algebra.h>
+ namespace dg = dynamicgraph;
+diff --git a/include/sot/core/robot-simu.hh b/include/sot/core/robot-simu.hh
+index 60a8b56c..2c3da3e7 100644
+--- include/sot/core/robot-simu.hh
++++ include/sot/core/robot-simu.hh
+@@ -13,6 +13,8 @@
+ /* --- INCLUDE --------------------------------------------------------- */
+ /* --------------------------------------------------------------------- */
+ 
++#include <pinocchio/fwd.hpp>
++
+ /* -- MaaL --- */
+ #include <dynamic-graph/linear-algebra.h>
+ namespace dg = dynamicgraph;
+-- 
+2.17.1
+
diff --git a/sot-core-v3/Makefile b/sot-core-v3/Makefile
index 6bc1c6038492df81b8c57738def990b831fd3a4a..466c8d51039ddc949b5b9e274404282f58ce38ef 100644
--- a/sot-core-v3/Makefile
+++ b/sot-core-v3/Makefile
@@ -5,14 +5,10 @@
 ORG=			stack-of-tasks
 NAME=			sot-core
 VERSION=		4.5.0
+PKGREVISION=		1
 
-DISTNAME=		${NAME}-${VERSION}
 PKGNAME=		${NAME}-v3-${VERSION}
 
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+=	--recursive
-
 CATEGORIES=		wip
 COMMENT=		Hierarchical task based control of humanoid robots
 LICENSE=		2-clause-bsd
@@ -21,10 +17,8 @@ MAINTAINER=		gepetto-soft@laas.fr
 CONFLICTS+=		${NAME}
 
 CMAKE_ARGS+=		-DBUILD_PYTHON_INTERFACE=OFF
-CMAKE_ARGS+=		-DCMAKE_INSTALL_LIBDIR=lib
-
-DYNAMIC_PLIST_DIRS+=	share/doc/${NAME}
 
+include ../../wip/jrl-cmakemodules/Makefile.common
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
 include ../../math/eigen3/depend.mk
diff --git a/sot-core-v3/distinfo b/sot-core-v3/distinfo
index 52e64b6921b6028ab83df924f6fc7a489f35a743..882c1ac261ada8e15997d210dc28cf7429aaadff 100644
--- a/sot-core-v3/distinfo
+++ b/sot-core-v3/distinfo
@@ -1,3 +1,4 @@
 SHA1 (sot-core-4.5.0.tar.gz) = 16ede3f2fb97bffa3fbc84ca592abee48e9bd9c1
 RMD160 (sot-core-4.5.0.tar.gz) = 7ec0e92eee0ab50dac2af2a0d40f2f4afce8c79c
 Size (sot-core-4.5.0.tar.gz) = 1107245 bytes
+SHA1 (patch-aa) = d0f79fa4777967d2d114a1f83ae3c9406e572f43
diff --git a/sot-core-v3/patches/patch-aa b/sot-core-v3/patches/patch-aa
new file mode 100644
index 0000000000000000000000000000000000000000..d35d04e2eae4f6be32d412c53ee4608669a1aae7
--- /dev/null
+++ b/sot-core-v3/patches/patch-aa
@@ -0,0 +1,40 @@
+From 8a36be8624dd19753d115edcdb8a7e77d464a5c4 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 13 Sep 2019 13:50:57 +0200
+Subject: [PATCH]  include pinocchio before boost
+
+ref https://github.com/stack-of-tasks/pinocchio/issues/849
+---
+ include/sot/core/device.hh     | 2 ++
+ include/sot/core/robot-simu.hh | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/include/sot/core/device.hh b/include/sot/core/device.hh
+index f81de5ed..fe1e6693 100644
+--- include/sot/core/device.hh
++++ include/sot/core/device.hh
+@@ -13,6 +13,8 @@
+ /* --- INCLUDE --------------------------------------------------------- */
+ /* --------------------------------------------------------------------- */
+ 
++#include <pinocchio/fwd.hpp>
++
+ /* -- MaaL --- */
+ #include <dynamic-graph/linear-algebra.h>
+ namespace dg = dynamicgraph;
+diff --git a/include/sot/core/robot-simu.hh b/include/sot/core/robot-simu.hh
+index 60a8b56c..2c3da3e7 100644
+--- include/sot/core/robot-simu.hh
++++ include/sot/core/robot-simu.hh
+@@ -13,6 +13,8 @@
+ /* --- INCLUDE --------------------------------------------------------- */
+ /* --------------------------------------------------------------------- */
+ 
++#include <pinocchio/fwd.hpp>
++
+ /* -- MaaL --- */
+ #include <dynamic-graph/linear-algebra.h>
+ namespace dg = dynamicgraph;
+-- 
+2.17.1
+