diff --git a/hpp-rbprm-robot-data/Makefile b/hpp-rbprm-robot-data/Makefile
index 90af9f5395393928b3b03c42263abeea77a2abbc..3a8698702b14358a770ff636ae0218d39dd413a2 100644
--- a/hpp-rbprm-robot-data/Makefile
+++ b/hpp-rbprm-robot-data/Makefile
@@ -7,9 +7,10 @@ HPP_COMMENT=	file database
 
 CATEGORIES=	wip
 
+USE_PYTHON=	true
+
 include ../../meta-pkgs/hpp/Makefile.common
 
-include ../../mk/sysdep/python.mk
 include ../../mk/language/c.mk
 include ../../mk/language/c++11.mk
 include ../../mk/robotpkg.mk
diff --git a/hpp-rbprm/Makefile b/hpp-rbprm/Makefile
index 3cff01518a8062aac171f3153c6b2fcd5234f928..c7fb6fff3c203604dd4d01206e8dff7934803866 100644
--- a/hpp-rbprm/Makefile
+++ b/hpp-rbprm/Makefile
@@ -7,6 +7,8 @@ HPP_COMMENT=	RB-PRM planner in HPP
 
 CATEGORIES=	wip
 
+USE_PYTHON=	true
+
 include ../../meta-pkgs/hpp/Makefile.common
 
 include ../../wip/hpp-rbprm-robot-data/depend.mk
@@ -29,5 +31,5 @@ include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk
 
 include ../../mk/language/c.mk
-include ../../mk/language/c++.mk
+include ../../mk/language/c++11.mk
 include ../../mk/robotpkg.mk
diff --git a/hpp-rbprm/depend.mk b/hpp-rbprm/depend.mk
index 0df63c04b6546e341a2dc063489f42597ae0045f..3cbf4e5adcaf0beaaeff05679024b3f00b493826 100644
--- a/hpp-rbprm/depend.mk
+++ b/hpp-rbprm/depend.mk
@@ -11,11 +11,13 @@ endif
 
 ifeq (+,$(HPP_RBPRM_DEPEND_MK)) # --------------------------------------
 
+include ../../mk/sysdep/python.mk
+
 PREFER.hpp-rbprm?=	robotpkg
 
 DEPEND_USE+=		hpp-rbprm
 
-DEPEND_ABI.hpp-rbprm?=	hpp-rbprm>=4.6.0
+DEPEND_ABI.hpp-rbprm?=	${PKGTAG.python-}hpp-rbprm>=4.7.0
 DEPEND_DIR.hpp-rbprm?=	../../wip/hpp-rbprm
 
 SYSTEM_SEARCH.hpp-rbprm=\
diff --git a/hpp-rbprm/distinfo b/hpp-rbprm/distinfo
index c5e97b219e6b0a9e12a11cb48ad44df9426488f9..7b573deb0f02e0e3244f8ae6235839ba34e28f3c 100644
--- a/hpp-rbprm/distinfo
+++ b/hpp-rbprm/distinfo
@@ -1,4 +1,3 @@
-SHA1 (hpp-rbprm-4.6.0.tar.gz) = 1e3fb3824339b452148edc3ffed908ff24ffd780
-RMD160 (hpp-rbprm-4.6.0.tar.gz) = 947f18b705ca397801dfadc221a0c7d5c5ddd6cb
-Size (hpp-rbprm-4.6.0.tar.gz) = 1233157 bytes
-SHA1 (patch-aa) = 4dc13a6bc53de45ad0190e8b953059b085c9924d
+SHA1 (hpp-rbprm-4.7.0.tar.gz) = 0d728f955ec9fc5482f895c910abc032f2c778c5
+RMD160 (hpp-rbprm-4.7.0.tar.gz) = 74eab97be13abbf54f2ca9da1d0d669c6b842758
+Size (hpp-rbprm-4.7.0.tar.gz) = 1237717 bytes
diff --git a/hpp-rbprm/patches/patch-aa b/hpp-rbprm/patches/patch-aa
deleted file mode 100644
index ac20ca70d76df5fe12c2ee61ad322c1f5a34adb4..0000000000000000000000000000000000000000
--- a/hpp-rbprm/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-include pinocchio before boost, ref
-https://github.com/stack-of-tasks/pinocchio/issues/849
-
---- src/utils/algorithms.cc.orig	2019-05-29 17:04:49.000000000 +0200
-+++ src/utils/algorithms.cc	2019-08-21 13:47:38.987440983 +0200
-@@ -1,3 +1,4 @@
-+#include <pinocchio/fwd.hpp>
- #include "hpp/rbprm/utils/algorithms.h"
- #include <hpp/fcl/intersect.h>
- #include <hpp/util/debug.hh>
---- tests/test-rbrrt.cc.orig	2019-05-29 17:04:49.000000000 +0200
-+++ tests/test-rbrrt.cc	2019-08-21 13:48:38.358849918 +0200
-@@ -18,6 +18,7 @@
- 
- 
- #define BOOST_TEST_MODULE test-rbrrt
-+#include <pinocchio/fwd.hpp>
- #include <boost/test/included/unit_test.hpp>
- 
- #include <hpp/core/problem-solver.hh>
---- tests/test-projection.cc.orig	2019-05-29 17:04:49.000000000 +0200
-+++ tests/test-projection.cc	2019-08-21 13:49:20.094435386 +0200
-@@ -1,4 +1,5 @@
- #define BOOST_TEST_MODULE test-projection
-+#include <pinocchio/fwd.hpp>
- #include <boost/test/included/unit_test.hpp>
- 
- #include "tools-fullbody.hh"
---- tests/test-kinodynamic.cc.orig	2019-05-29 17:04:49.000000000 +0200
-+++ tests/test-kinodynamic.cc	2019-08-21 13:49:57.286066627 +0200
-@@ -18,6 +18,7 @@
- 
- 
- #define BOOST_TEST_MODULE test-kinodynamic
-+#include <pinocchio/fwd.hpp>
- #include <boost/test/included/unit_test.hpp>
- 
- #include <hpp/core/problem-solver.hh>