diff --git a/crlcore/CMakeLists.txt b/crlcore/CMakeLists.txt
index ebce9b77..8c3e5bbb 100644
--- a/crlcore/CMakeLists.txt
+++ b/crlcore/CMakeLists.txt
@@ -3,6 +3,8 @@
 
  cmake_minimum_required(VERSION 2.4.0)
 
+ OPTION(BUILD_DOC    "Build the documentation (latex+doxygen)" OFF)
+
  list(INSERT CMAKE_MODULE_PATH 0 "$ENV{BOOTSTRAP_TOP}/share/cmake/Modules/")
  find_package(Bootstrap REQUIRED)
  setup_project_paths(VLSISAPD)
@@ -33,6 +35,11 @@
  add_subdirectory(src)
  add_subdirectory(etc)
  add_subdirectory(cmake_modules)
+
+ if(BUILD_DOC)
+  FIND_PACKAGE(Doxygen)
+ endif(BUILD_DOC)
+
  if(BUILD_DOC)
    add_subdirectory(doc)
  endif(BUILD_DOC)
diff --git a/crlcore/doc/CMakeLists.txt b/crlcore/doc/CMakeLists.txt
index dbf297b9..d93a73e5 100644
--- a/crlcore/doc/CMakeLists.txt
+++ b/crlcore/doc/CMakeLists.txt
@@ -21,3 +21,7 @@
                                ${output_dir}/README.pdf
                                DESTINATION ${latexInstallDir} )
                install ( DIRECTORY ${output_dir}/README DESTINATION ${htmlInstallDir} )
+
+IF(DOXYGEN_FOUND)
+ add_subdirectory(doxygen)
+ENDIF(DOXYGEN_FOUND)