diff --git a/multicontact-api/Makefile b/multicontact-api/Makefile
index fd8f2dd36342cad4af3fc1ce695837fea69c9387..7c34d0e79453898688dbbdd1e6a39f6289b1157b 100644
--- a/multicontact-api/Makefile
+++ b/multicontact-api/Makefile
@@ -4,13 +4,7 @@
ORG= loco-3d
NAME= multicontact-api
-VERSION= 1.1.0
-
-DISTNAME= ${NAME}-${VERSION}
-
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+= --recursive
+VERSION= 1.1.1
CATEGORIES= wip
COMMENT= Multi-contact locomotion for multi-body systems
@@ -18,10 +12,8 @@ LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
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 ../../graphics/assimp/depend.mk
include ../../graphics/urdfdom/depend.mk
include ../../mapping/octomap/depend.mk
diff --git a/multicontact-api/distinfo b/multicontact-api/distinfo
index f7c3d824eed32793ef45d4458ae8cac9b51fee64..97dbdcf1f68ed2be6d0144d072732ae46d0ff7c8 100644
--- a/multicontact-api/distinfo
+++ b/multicontact-api/distinfo
@@ -1,3 +1,3 @@
-SHA1 (multicontact-api-1.1.0.tar.gz) = 26426a436425f97a1669f506284f1445b20d6006
-RMD160 (multicontact-api-1.1.0.tar.gz) = 7e5fabce63b31b385f0214456da004f37679a0ce
-Size (multicontact-api-1.1.0.tar.gz) = 804971 bytes
+SHA1 (multicontact-api-1.1.1.tar.gz) = 8878758472e40c08b4008e424a65935ee66a0bce
+RMD160 (multicontact-api-1.1.1.tar.gz) = 9e27796d02d7758bb964dd082d29191b4f3729e4
+Size (multicontact-api-1.1.1.tar.gz) = 805349 bytes
diff --git a/py-multicontact-api/Makefile b/py-multicontact-api/Makefile
index 2c9012bf9a992540b8cda7e1c32f944d49f00e08..da8c116d14cdb8c006d3d0a2f705d06bd6a354c1 100644
--- a/py-multicontact-api/Makefile
+++ b/py-multicontact-api/Makefile
@@ -4,22 +4,18 @@
ORG= loco-3d
NAME= multicontact-api
-VERSION= 1.1.0
+VERSION= 1.1.1
-DISTNAME= ${NAME}-${VERSION}
PKGNAME= ${PKGTAG.python-}${DISTNAME}
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY= ${MASTER_REPOSITORY_GITHUB}/${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+= --recursive
-
CATEGORIES= wip
COMMENT= Multi-contact locomotion for multi-body systems
LICENSE= 2-clause-bsd
MAINTAINER= gepetto-soft@laas.fr
-CMAKE_ARGS+= -DINSTALL_DOCUMENTATION=OFF
+CMAKE_ARGS+= -DINSTALL_PYTHON_INTERFACE_ONLY=ON
+include ../../wip/jrl-cmakemodules/Makefile.common
include ../../wip/${NAME}/depend.mk
include ../../math/py-eigenpy/depend.mk
include ../../math/py-pinocchio/depend.mk
diff --git a/py-multicontact-api/distinfo b/py-multicontact-api/distinfo
index 9981d2d0349835d8e93cd142eb22aec3aceb9656..97dbdcf1f68ed2be6d0144d072732ae46d0ff7c8 100644
--- a/py-multicontact-api/distinfo
+++ b/py-multicontact-api/distinfo
@@ -1,6 +1,3 @@
-SHA1 (multicontact-api-1.1.0.tar.gz) = 26426a436425f97a1669f506284f1445b20d6006
-RMD160 (multicontact-api-1.1.0.tar.gz) = 7e5fabce63b31b385f0214456da004f37679a0ce
-Size (multicontact-api-1.1.0.tar.gz) = 804971 bytes
-SHA1 (patch-aa) = 1e49750ab8963bb849218f3028d26713052791f0
-SHA1 (patch-ab) = 83aeb011c56e1d2a9d4da3efae6d2904b207cf06
-SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
+SHA1 (multicontact-api-1.1.1.tar.gz) = 8878758472e40c08b4008e424a65935ee66a0bce
+RMD160 (multicontact-api-1.1.1.tar.gz) = 9e27796d02d7758bb964dd082d29191b4f3729e4
+Size (multicontact-api-1.1.1.tar.gz) = 805349 bytes
diff --git a/py-multicontact-api/patches/patch-aa b/py-multicontact-api/patches/patch-aa
deleted file mode 100644
index 8085c94d8e8a07d0e9e62bfafb897dbfdaf90c24..0000000000000000000000000000000000000000
--- a/py-multicontact-api/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-don't install headers, already installed by main package
-
---- CMakeLists.txt.orig 2019-03-28 11:52:49.000000000 +0100
-+++ CMakeLists.txt 2019-03-28 12:54:27.982041064 +0100
-@@ -40,7 +40,6 @@
- SEARCH_FOR_BOOST()
- INCLUDE_DIRECTORIES(SYSTEM ${Boost_INCLUDE_DIRS})
-
--ADD_SUBDIRECTORY(include/${CUSTOM_HEADER_DIR})
- ADD_SUBDIRECTORY(bindings)
- ADD_SUBDIRECTORY(unittest)
-
diff --git a/py-multicontact-api/patches/patch-ab b/py-multicontact-api/patches/patch-ab
deleted file mode 100644
index 5e1c7cb2121c018e8d5931c268b51d96573f05b6..0000000000000000000000000000000000000000
--- a/py-multicontact-api/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't install the .pc file, which is already installed by main package
-
---- cmake/base.cmake.orig 2018-07-11 10:41:37.000000000 +0200
-+++ cmake/base.cmake 2018-12-13 14:15:46.772836002 +0100
-@@ -226,7 +226,7 @@
- # finalize the project setup.
- #
- MACRO(SETUP_PROJECT_FINALIZE)
-- _SETUP_PROJECT_PKG_CONFIG_FINALIZE()
-+ #_SETUP_PROJECT_PKG_CONFIG_FINALIZE()
- _SETUP_PROJECT_DOCUMENTATION_FINALIZE()
- _SETUP_PROJECT_HEADER_FINAlIZE()
- _SETUP_DEBIAN()
diff --git a/py-multicontact-api/patches/patch-ad b/py-multicontact-api/patches/patch-ad
deleted file mode 100644
index 83ef8fe0054c7c19212a59d6abe3cc57a3f10707..0000000000000000000000000000000000000000
--- a/py-multicontact-api/patches/patch-ad
+++ /dev/null
@@ -1,40 +0,0 @@
-Don't install main headers
-
---- cmake/header.cmake~ 2017-10-26 15:25:19.000000000 +0200
-+++ cmake/header.cmake 2018-04-26 18:37:42.582417765 +0200
-@@ -92,11 +92,6 @@
- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
- @ONLY
- )
-- INSTALL(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/deprecated.${PROJECT_CUSTOM_HEADER_EXTENSION}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
-- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-- )
- # Generate warning.hh header.
- CONFIGURE_FILE(
- ${PROJECT_SOURCE_DIR}/cmake/warning.hh.cmake
-@@ -104,11 +99,6 @@
- @ONLY
- )
-
-- INSTALL(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/warning.${PROJECT_CUSTOM_HEADER_EXTENSION}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
-- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-- )
-
-
- # Generate config.h header.
-@@ -150,11 +140,6 @@
- @ONLY
- )
- # Install it.
-- INSTALL(FILES
-- ${CMAKE_CURRENT_BINARY_DIR}/include/${HEADER_DIR}/${FILENAME}
-- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${HEADER_DIR}
-- PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
-- )
- ENDFUNCTION(GENERATE_CONFIGURATION_HEADER)
-
-