diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6a602b80..61689ca5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,7 +211,7 @@ CONFIGURE_FILE("${OPENJPEG_SOURCE_DIR}/opj_config.h.cmake.in"
 
 #-----------------------------------------------------------------------------
 # Build DOCUMENTATION (not in ALL target and only if Doxygen is found)
-OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." ON)
+OPTION(BUILD_DOC "Build the HTML documentation (with doxygen if available)." OFF)
 IF(BUILD_DOC)
     ADD_SUBDIRECTORY(doc)
 ENDIF(BUILD_DOC)
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 89ad74d8..0c00e31a 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -11,7 +11,7 @@ IF(DOXYGEN_FOUND)
     ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox @ONLY)
   
   # Generate new target to build the html documentation
-  ADD_CUSTOM_TARGET(doc
+  ADD_CUSTOM_TARGET(doc ALL
     ${DOXYGEN_EXECUTABLE} ${CMAKE_BINARY_DIR}/doc/Doxyfile-html.dox)
 
 ELSE(DOXYGEN_FOUND)