diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8f669164a28a2fb882ead5af574a209d04921716..52a4f8d27d9b4ed1133a12c94c4c94ef22c76a73 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,12 +37,12 @@ set(CXX_DISABLE_WERROR TRUE)
 include(cmake/base.cmake)
 include(cmake/eigen.cmake)
 include(cmake/boost.cmake)
+include(cmake/hpp.cmake)
 
 set(PROJECT_NAME hpp-fcl)
 set(PROJECT_DESCRIPTION
-  "FCL -- The Flexible Collision Library"
+  "HPP fork of FCL -- The Flexible Collision Library"
   )
-set(PROJECT_URL "http://github.com/humanoid-path-planner/hpp-fcl")
 
 IF(APPLE)
   SET(CMAKE_MACOSX_RPATH TRUE)
@@ -57,7 +57,7 @@ IF(APPLE)
   endif("${isSystemDir}" STREQUAL "-1")
 ENDIF(APPLE)
 
-setup_project()
+setup_hpp_project()
 
 add_required_dependency("eigen3 >= 3.0.0")
 include_directories(${EIGEN3_INCLUDE_DIRS})
diff --git a/cmake b/cmake
index a921f1ead10e551804da70d6080a95dba1e673bd..ecaf20c28c8ce33de312fbd812f88037cf995b73 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit a921f1ead10e551804da70d6080a95dba1e673bd
+Subproject commit ecaf20c28c8ce33de312fbd812f88037cf995b73