diff --git a/Documentation/doc/CMakeLists.txt b/Documentation/doc/CMakeLists.txt
index 1e7e77c5065..889a6d15a82 100644
--- a/Documentation/doc/CMakeLists.txt
+++ b/Documentation/doc/CMakeLists.txt
@@ -198,7 +198,17 @@ file(MAKE_DIRECTORY "${CGAL_DOC_TAG_DIR}")
 set(CGAL_DOC_DXY_DIR "${CMAKE_BINARY_DIR}/doc_dxy")
 file(MAKE_DIRECTORY "${CGAL_DOC_DXY_DIR}")
 
-set(CGAL_DOC_RESOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/resources")
+#Setting the resource directory depending on the version of doxygen
+set(CGAL_DOC_RESOURCE_DIR_DEFAULT "${CMAKE_CURRENT_LIST_DIR}/resources/1.8.4")
+
+#  first look if resources for the specific doxygen version is available, fallback
+#  on the default otherwise
+if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/resources/${DOXYGEN_VERSION}")
+  set(CGAL_DOC_RESOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/resources/${DOXYGEN_VERSION}")
+else()
+  set(CGAL_DOC_RESOURCE_DIR "${CGAL_DOC_RESOURCE_DIR_DEFAULT}")
+endif()
+
 set(CGAL_DOC_BIBLIO_DIR "${CMAKE_CURRENT_LIST_DIR}/biblio")
 set(CGAL_DOC_SCRIPT_DIR "${CMAKE_CURRENT_LIST_DIR}/scripts")
 
diff --git a/Documentation/doc/resources/BaseDoxyfile.in b/Documentation/doc/resources/1.8.4/BaseDoxyfile.in
similarity index 100%
rename from Documentation/doc/resources/BaseDoxyfile.in
rename to Documentation/doc/resources/1.8.4/BaseDoxyfile.in
diff --git a/Documentation/doc/resources/DoxygenLayoutPackage.xml b/Documentation/doc/resources/1.8.4/DoxygenLayoutPackage.xml
similarity index 100%
rename from Documentation/doc/resources/DoxygenLayoutPackage.xml
rename to Documentation/doc/resources/1.8.4/DoxygenLayoutPackage.xml
diff --git a/Documentation/doc/resources/deprecated.html b/Documentation/doc/resources/1.8.4/deprecated.html
similarity index 100%
rename from Documentation/doc/resources/deprecated.html
rename to Documentation/doc/resources/1.8.4/deprecated.html
diff --git a/Documentation/doc/resources/footer.html b/Documentation/doc/resources/1.8.4/footer.html
similarity index 100%
rename from Documentation/doc/resources/footer.html
rename to Documentation/doc/resources/1.8.4/footer.html
diff --git a/Documentation/doc/resources/ftv2cl.png b/Documentation/doc/resources/1.8.4/ftv2cl.png
similarity index 100%
rename from Documentation/doc/resources/ftv2cl.png
rename to Documentation/doc/resources/1.8.4/ftv2cl.png
diff --git a/Documentation/doc/resources/ftv2cpt.png b/Documentation/doc/resources/1.8.4/ftv2cpt.png
similarity index 100%
rename from Documentation/doc/resources/ftv2cpt.png
rename to Documentation/doc/resources/1.8.4/ftv2cpt.png
diff --git a/Documentation/doc/resources/ftv2ns.png b/Documentation/doc/resources/1.8.4/ftv2ns.png
similarity index 100%
rename from Documentation/doc/resources/ftv2ns.png
rename to Documentation/doc/resources/1.8.4/ftv2ns.png
diff --git a/Documentation/doc/resources/header.html b/Documentation/doc/resources/1.8.4/header.html
similarity index 100%
rename from Documentation/doc/resources/header.html
rename to Documentation/doc/resources/1.8.4/header.html
diff --git a/Documentation/doc/resources/header_package.html b/Documentation/doc/resources/1.8.4/header_package.html
similarity index 100%
rename from Documentation/doc/resources/header_package.html
rename to Documentation/doc/resources/1.8.4/header_package.html
diff --git a/Documentation/doc/resources/stylesheet.css b/Documentation/doc/resources/1.8.4/stylesheet.css
similarity index 100%
rename from Documentation/doc/resources/stylesheet.css
rename to Documentation/doc/resources/1.8.4/stylesheet.css