diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c1ee5a7f08f58b2fc1eb3b25ba3b850d496ccc3..d0979d8b0291fe31fc487e5ab533b0ba4f272ef9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,7 +59,7 @@ ENDIF (\"${CMAKE_BUILD_TYPE}\" STREQUAL \"\")
 
 # --- Default options -------------------------------------------------
 OPTION(BUILD_SHARED_LIBS "Build ${PROJECT_NAME} with shared libraries." ON)
-OPTION(GENERATE_DOC "Generate html documentation" OFF)
+OPTION(GENERATE_DOC "Generate html documentation" ON)
 
 # --- BOOST ---------------------------------------------------
 SET(Boost_THREAD_FOUND 0)
diff --git a/doc/package.dox.cmake b/doc/package.dox.cmake
index 9d5cb9c293722e8f2c06ddea0867991829606d1c..ab60004c33bafc7f3cadb5d6355ced1144b907db 100644
--- a/doc/package.dox.cmake
+++ b/doc/package.dox.cmake
@@ -210,7 +210,7 @@ SHOW_DIRECTORIES       = NO
 #---------------------------------------------------------------------------
 FILE_PATTERNS          = *.h *.idl
 EXCLUDE_PATTERNS       = 
-INPUT                  = ${${PROJECT_NAME}_SOURCE_DIR}/src \
+INPUT                  = ${${PROJECT_NAME}_SOURCE_DIR}/include \
                          ${CMAKE_CURRENT_SOURCE_DIR}/additionalDoc
 
 #---------------------------------------------------------------------------