diff --git a/cmake/modules/Doxygen.cmake b/cmake/modules/Doxygen.cmake
index d88312b..f0c889a 100644
--- a/cmake/modules/Doxygen.cmake
+++ b/cmake/modules/Doxygen.cmake
@@ -6,15 +6,25 @@ find_template_file("doxygen" CPP_UTILITIES DOXYGEN_TEMPLATE_FILE)
 find_program(DOXYGEN_BIN doxygen)
 find_program(PERL_BIN perl)
 find_program(DIA_BIN dia)
+if(DIA_BIN)
+    set(HAVE_DIA "YES")
+else()
+    set(HAVE_DIA "NO")
+endif()
 find_program(DOT_BIN dot)
+if(DOT_BIN)
+    set(HAVE_DOT "YES")
+else()
+    set(HAVE_DOT "NO")
+endif()
 if(NOT DOXYGEN_BIN)
     message(WARNING "Doxygen not found, unable to add target for generating API documentation.")
 
 else()
     # load cached configuration and other variables
-    set(DOXY_LANGUAGE "English" CACHE STRING "specifies language of the API documentation generated with Doxygen")
+    set(DOXY_LANGUAGE "English" CACHE STRING "specifies the language of the API documentation generated with Doxygen")
     set(DOXY_CUSTOM_CONFIG "" CACHE STRING "specifies extra options for Doxygen")
-    set(DOXY_NUMBER 1)
+    set(DOXY_NUMBER "${META_APP_VERSION}")
     set(DOXY_INPUT_FILES ${HEADER_FILES} ${SRC_FILES} ${TEST_HEADER_FILES} ${TEST_SRC_FILES} ${WIDGETS_HEADER_FILES} ${WIDGETS_SRC_FILES} ${QML_HEADER_FILES} ${QML_SRC_FILES})
     set(DOXY_PATH_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/")
     list(GET DOC_FILES 0 DOXY_MAIN_PAGE_FILE)
diff --git a/cmake/templates/doxygen.in b/cmake/templates/doxygen.in
index c27ef50..d9f1021 100644
--- a/cmake/templates/doxygen.in
+++ b/cmake/templates/doxygen.in
@@ -224,7 +224,7 @@ CLASS_DIAGRAMS         = YES
 MSCGEN_PATH            =
 DIA_PATH               = @DIA_BIN@
 HIDE_UNDOC_RELATIONS   = YES
-HAVE_DOT               = YES
+HAVE_DOT               = @HAVE_DOT@
 DOT_NUM_THREADS        = 4
 DOT_FONTNAME           = Helvetica
 DOT_FONTSIZE           = 10