diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3102769e..5d04cb9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ SET(CXX_DISABLE_WERROR true)
 INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/idl.cmake)
 INCLUDE(cmake/hpp.cmake)
-INCLUDE(cmake/hpp/python.cmake)
+INCLUDE(cmake/python.cmake)
 
 SET(PROJECT_NAME hpp-rbprm-corba)
 SET(PROJECT_DESCRIPTION "Corba server for reachability based planning")
@@ -41,7 +41,7 @@ SET(${PROJECT_NAME}_HEADERS
   include/hpp/corbaserver/rbprm/server.hh
 )
 
-HPP_FINDPYTHON()
+FINDPYTHON()
 
 ADD_DOC_DEPENDENCY("hpp-core >= 4.3")
 ADD_REQUIRED_DEPENDENCY("hpp-corbaserver >= 4.3")
diff --git a/cmake b/cmake
index 20ceb603..c81a3719 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 20ceb603019a791854c2651a415d75af3acdb4c1
+Subproject commit c81a37191d764522899b5dcb4468485a826141c2