diff --git a/CMakeLists.txt b/CMakeLists.txt
index 47b1245fa8b3c833940283bca958dff849c87890..228ff1b0a803db2e33a3766d2946c24085964c39 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,6 @@ SET(PROJECT_NAME hpp_tutorial)
 SET(PROJECT_DESCRIPTION
   "Tutorial for humanoid path planner platform."
 )
-SET(PROJECT_URL "")
 
 FINDPYTHON(2.7 EXACT REQUIRED)
 
@@ -91,16 +90,18 @@ install (FILES
   DESTINATION ${PYTHON_SITELIB}/hpp/corbaserver/manipulation/pr2)
 
 # Installation for documentation
-install(FILES
-  urdf/pr2.urdf
-  urdf/box.urdf
-  DESTINATION
-  ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}/doxygen-html/urdf
-  )
-install(FILES
-  script/tutorial_1.py
-  script/tutorial_2.py
-  DESTINATION
-  ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}/doxygen-html/script
-  )
+IF(INSTALL_DOCUMENTATION)
+  install(FILES
+    urdf/pr2.urdf
+    urdf/box.urdf
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}/doxygen-html/urdf
+    )
+  install(FILES
+    script/tutorial_1.py
+    script/tutorial_2.py
+    DESTINATION
+    ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}/doxygen-html/script
+    )
+ENDIF(INSTALL_DOCUMENTATION)
 SETUP_PROJECT_FINALIZE()
diff --git a/cmake b/cmake
index 320c636960b03b3bad7c7a08bd2e104951f42bc3..d128cc2965a7878dc38acf8f4395e1899aa505cb 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 320c636960b03b3bad7c7a08bd2e104951f42bc3
+Subproject commit d128cc2965a7878dc38acf8f4395e1899aa505cb