diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt
index 00c6a3f045..cda6863de7 100755
--- a/hipamd/CMakeLists.txt
+++ b/hipamd/CMakeLists.txt
@@ -317,8 +317,15 @@ file(WRITE "${PROJECT_BINARY_DIR}/.hipVersion" ${_versionInfo})
 # Build doxygen documentation
 find_program(DOXYGEN_EXE doxygen)
 if(DOXYGEN_EXE)
-    add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} ${DOXYGEN_EXE} ${CMAKE_CURRENT_SOURCE_DIR}/docs/doxygen-input/doxy.cfg
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+    if(EXISTS "${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg")
+        add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} ${DOXYGEN_EXE} ${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+    elseif(EXISTS "${HIP_COMMON_DIR}/docs/.doxygen/Doxyfile")
+        add_custom_target(doc COMMAND HIP_PATH=${CMAKE_CURRENT_SOURCE_DIR} ${DOXYGEN_EXE} ${HIP_COMMON_DIR}/docs/.doxygen/Doxyfile
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+    else()
+        message(STATUS "Unable to find doxygen config file. Will not generate doxygen output")
+    endif()
 endif()
 
 #############################
diff --git a/hipamd/packaging/CMakeLists.txt b/hipamd/packaging/CMakeLists.txt
index 6db2f43007..1a80e7e8c8 100644
--- a/hipamd/packaging/CMakeLists.txt
+++ b/hipamd/packaging/CMakeLists.txt
@@ -104,8 +104,15 @@ install(DIRECTORY ${HIP_COMMON_DIR}/cmake/ DESTINATION ${CMAKE_INSTALL_LIBDIR}/c
 #Begin doc files install
 find_program(DOXYGEN_EXE doxygen)
 if(DOXYGEN_EXE)
-    add_custom_target(build_doxygen ALL
-                  COMMAND HIP_PATH=${HIP_COMMON_DIR} doxygen ${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg)
+    if(EXISTS "${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg")
+        add_custom_target(build_doxygen ALL
+            COMMAND HIP_PATH=${HIP_COMMON_DIR} doxygen ${HIP_COMMON_DIR}/docs/doxygen-input/doxy.cfg)
+    elseif(EXISTS "${HIP_COMMON_DIR}/docs/.doxygen/Doxyfile")
+        add_custom_target(build_doxygen ALL
+            COMMAND HIP_PATH=${HIP_COMMON_DIR} doxygen ${HIP_COMMON_DIR}/docs/.doxygen/Doxyfile)
+    else()
+        message(FATAL_ERROR "Unable to find doxygen config file")
+    endif()
     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/RuntimeAPI/html
             DESTINATION ${CMAKE_INSTALL_DOCDIR}/RuntimeAPI COMPONENT doc)
 endif()