diff --git a/cmake/config_generator_project.cmake b/cmake/config_generator_project.cmake
index eca67af3a65553beb6e0fbd87fbe80750d3091c5..87b381f3c92174e41c5c26e42200bcc43184308b 100644
--- a/cmake/config_generator_project.cmake
+++ b/cmake/config_generator_project.cmake
@@ -38,7 +38,7 @@ endforeach()
 
 # copy all server type directories to the build directory
 foreach(servertype ${servertypes})
-  file(GLOB_RECURSE files RELATIVE ${PROJECT_SOURCE_DIR} ${servertype}/*)
+  file(GLOB_RECURSE files FOLLOW_SYMLINKS RELATIVE ${PROJECT_SOURCE_DIR} ${servertype}/*)
   foreach(f ${files})
     configure_file("${f}" "${PROJECT_BINARY_DIR}/${f}" COPYONLY)
   endforeach()
diff --git a/cmake/enable_doxygen_documentation.cmake b/cmake/enable_doxygen_documentation.cmake
index 16da4d444f71805241b714cbb4bc5f30b0c74f52..f655b9bbd016ccf07d115b840af9b0c0e3e58c8d 100644
--- a/cmake/enable_doxygen_documentation.cmake
+++ b/cmake/enable_doxygen_documentation.cmake
@@ -43,7 +43,7 @@ if(DOXYGEN_FOUND)
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
 
   add_custom_target(doc ${DOC_DEPENDENCY}
-    ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+    COMMAND ${CMAKE_COMMAND} -E env GS_OPTIONS=-dNOSAFER ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
   #note the / after ${CMAKE_BINARY_DIR}/doc/. This causes the directory to be renamed to the destination, not copied into