diff --git a/BGL/doc/BGL/Doxyfile.in b/BGL/doc/BGL/Doxyfile.in
index 4b1752cf784..87ad5f68823 100644
--- a/BGL/doc/BGL/Doxyfile.in
+++ b/BGL/doc/BGL/Doxyfile.in
@@ -5,9 +5,9 @@ INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/Euler_operations.h \
          ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/iterator.h \
          ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/Graph_geometry.h \
          ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/helpers.h \
-         ${CMAKE_SOURCE_DIR}/BGL/include/CGAL/boost/graph/selection.h
-         ${CMAKE_SOURCE_DIR}/BGL/include/CGAL/boost/graph/split_graph_into_polylines.h
-EXAMPLE_PATH               =  ${CMAKE_SOURCE_DIR}/Surface_mesh_skeletonization/examples \
-                              ${CMAKE_SOURCE_DIR}/BGL/examples
+         ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/selection.h \
+         ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/split_graph_into_polylines.h
+EXAMPLE_PATH               =  ${CGAL_Surface_mesh_skeletonization_EXAMPLE_DIR} \
+                              ${CGAL_BGL_EXAMPLE_DIR}
 
 ALIASES +=  "bgllink{1}=<a href=\"http://www.boost.org/libs/graph/doc/\1.html\"><code>\1</code></a>"
diff --git a/Documentation/doc/CMakeLists.txt b/Documentation/doc/CMakeLists.txt
index 6f3b18c62ba..8b8ae08fc44 100644
--- a/Documentation/doc/CMakeLists.txt
+++ b/Documentation/doc/CMakeLists.txt
@@ -235,7 +235,7 @@ if(CGAL_BRANCH_BUILD)
     if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/${pkg}/doc/${pkg})
       list(APPEND CGAL_DOC_PACKAGES ${pkg})
     endif()
-    if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/${pkg}/examples/${pkg})
+    if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/${pkg}/examples)
       set(CGAL_${pkg}_EXAMPLE_DIR "${CMAKE_SOURCE_DIR}/${pkg}/examples")
     endif()
     if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/${pkg}/include)
@@ -256,6 +256,7 @@ else()
 
   subdirlist(CGAL_EXAMPLE_PACKAGES ${CMAKE_SOURCE_DIR}/examples)
   subdirlist(CGAL_DEMO_PACKAGES ${CMAKE_SOURCE_DIR}/demo)
+  list(APPEND CGAL_EXAMPLE_PACKAGES "BGL") # manually add BGL to the list of packages
   foreach(pkg ${CGAL_EXAMPLE_PACKAGES})
     set(CGAL_${pkg}_EXAMPLE_DIR "${CMAKE_SOURCE_DIR}/examples")
     # This might not be entirely correct, but there is no reliable,