diff --git a/py-curves/Makefile b/py-curves/Makefile
index 840c03a5c9646c471147fabcbce00647515cee6e..8ee99cb97f9e913fdf0844959bc9f37e36466ffc 100644
--- a/py-curves/Makefile
+++ b/py-curves/Makefile
@@ -4,14 +4,7 @@
ORG= loco-3d
NAME= curves
-VERSION= 0.1.0
-
-DISTNAME= ${NAME}-${VERSION}
-PKGNAME= ${PKGTAG.python-}${DISTNAME}
-
-MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=${NAME}/}
-MASTER_REPOSITORY= git https://gepgitlab.laas.fr/${ORG}/${NAME}.git
-CHECKOUT_VCS_OPTS+= --recursive
+VERSION= 0.2.0
CATEGORIES= wip
COMMENT= Library for creating curves
@@ -19,12 +12,9 @@ COMMENT= Library for creating curves
LICENSE= 2-clause-bsd
MAINTAINER= gepetto@laas.fr
-CMAKE_ARGS+= -DCMAKE_INSTALL_LIBDIR=lib
-
-DYNAMIC_PLIST_DIRS+= share/doc/${NAME}
-
USE_BOOST_LIBS= python
+include ../../devel/jrl-cmakemodules/Makefile.common
include ../../devel/boost-headers/depend.mk
include ../../devel/boost-libs/depend.mk
include ../../pkgtools/pkg-config/depend.mk
diff --git a/py-curves/PLIST b/py-curves/PLIST
index eafc48696dffe042654824f941f933d247cf73bb..b3fe92ec2e8441477abeb699c18907ceb453b5b9 100644
--- a/py-curves/PLIST
+++ b/py-curves/PLIST
@@ -1,20 +1,24 @@
@comment Wed Apr 17 11:40:08 CEST 2019
-include/curve/MathDefs.h
-include/curve/bernstein.h
-include/curve/bezier_curve.h
-include/curve/bezier_polynom_conversion.h
-include/curve/cubic_spline.h
-include/curve/curve_abc.h
-include/curve/curve_constraint.h
-include/curve/exact_cubic.h
-include/curve/helpers/effector_spline.h
-include/curve/helpers/effector_spline_rotation.h
-include/curve/linear_variable.h
-include/curve/polynom.h
-include/curve/quintic_spline.h
-include/curve/spline_deriv_constraint.h
+include/curves/MathDefs.h
+include/curves/bernstein.h
+include/curves/bezier_curve.h
include/curves/config.hh
+include/curves/cubic_hermite_spline.h
+include/curves/cubic_spline.h
+include/curves/curve_abc.h
+include/curves/curve_constraint.h
+include/curves/curve_conversion.h
include/curves/deprecated.hh
+include/curves/exact_cubic.h
+include/curves/helpers/effector_spline.h
+include/curves/helpers/effector_spline_rotation.h
+include/curves/linear_variable.h
+include/curves/piecewise_curve.h
+include/curves/polynomial.h
+include/curves/quintic_spline.h
+include/curves/serialization/archive.hpp
+include/curves/serialization/eigen-matrix.hpp
+include/curves/serialization/fwd.hpp
include/curves/warning.hh
lib/pkgconfig/curves.pc
${PYTHON_SITELIB}/curves.so
diff --git a/py-curves/distinfo b/py-curves/distinfo
index 65e50f06e3654ae6005a17032ddf86ec45a8b9d8..1371a46a80dfad471d45f995b9e5d3f0dab26dd3 100644
--- a/py-curves/distinfo
+++ b/py-curves/distinfo
@@ -1,4 +1,3 @@
-SHA1 (curves-0.1.0.tar.gz) = 7b8319e4badbc8cc513e06d5be99e7590b613a76
-RMD160 (curves-0.1.0.tar.gz) = d60b123e9488790428b83052e29712cde05654cc
-Size (curves-0.1.0.tar.gz) = 805794 bytes
-SHA1 (patch-aa) = 728e16f0054e05df8916b5b7f096a33d7eb64437
+SHA1 (curves-0.2.0.tar.gz) = 32a2c210f58d0afef3b1d3dba1d31cda6041439c
+RMD160 (curves-0.2.0.tar.gz) = 74b75d72ea6c47bcc1c45e48c8b386bc5f95e5f1
+Size (curves-0.2.0.tar.gz) = 831459 bytes
diff --git a/py-curves/patches/patch-aa b/py-curves/patches/patch-aa
deleted file mode 100644
index b89ff71dc25dde60494b562b96cb801827c04cd6..0000000000000000000000000000000000000000
--- a/py-curves/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-From b00c549fa309a1f16d4f20041778e357cceea3ef Mon Sep 17 00:00:00 2001
-From: Guilhem Saurel <guilhem.saurel@laas.fr>
-Date: Wed, 17 Apr 2019 13:04:37 +0200
-Subject: [PATCH] [Test][Python] Remove StringIO, which is useless and fails in
- python 3
-
----
- python/test/test.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/python/test/test.py b/python/test/test.py
-index d77db6b..2887625 100644
---- python/test/test.py
-+++ python/test/test.py
-@@ -1,5 +1,4 @@
- # FOR PRINT, TO REMOVE
--import StringIO
- import sys
- # END FOR PRINT
-
---
-2.17.1
-