diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef26691db1ece17d8fee441a9a7399b7d8218dd6..9dc45d57a948533f39c355d3395e87d51376a7ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,22 +17,20 @@
 # hpp_tutorial  If not, see
 # <http://www.gnu.org/licenses/>.
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+
+SET(PROJECT_NAME hpp_tutorial)
+SET(PROJECT_DESCRIPTION "Tutorial for humanoid path planner platform.")
 
 SET(CXX_DISABLE_WERROR TRUE)
-INCLUDE(cmake/base.cmake)
 INCLUDE(cmake/hpp.cmake)
 INCLUDE(cmake/python.cmake)
 
-SET(PROJECT_NAME hpp_tutorial)
-SET(PROJECT_DESCRIPTION
-  "Tutorial for humanoid path planner platform."
-)
+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
+PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
 
 FINDPYTHON()
 
-SETUP_HPP_PROJECT()
-
 ADD_DOC_DEPENDENCY("hpp-core >= 4")
 ADD_DOC_DEPENDENCY("hpp-corbaserver >= 4")
 ADD_REQUIRED_DEPENDENCY("hpp-manipulation-corba >= 4")
@@ -97,5 +95,3 @@ IF(INSTALL_DOCUMENTATION)
     ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}/doxygen-html/script
     )
 ENDIF(INSTALL_DOCUMENTATION)
-
-SETUP_HPP_PROJECT_FINALIZE()
diff --git a/cmake b/cmake
index c81a37191d764522899b5dcb4468485a826141c2..7eca9ee6c9d1c4ee20eb82272e94f9d11642053a 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit c81a37191d764522899b5dcb4468485a826141c2
+Subproject commit 7eca9ee6c9d1c4ee20eb82272e94f9d11642053a