diff --git a/docs/docs.pro b/docs/docs.pro
index 5d295fdd6..d64c2add4 100644
--- a/docs/docs.pro
+++ b/docs/docs.pro
@@ -6,31 +6,39 @@ TEMPLATE = lib
 CONFIG += staticlib
 CONFIG -= qt
 
-DOXYFILE = Doxyfile.qmake
+win32: DOXYGEN_BIN = $$system(where doxygen)
+else: DOXYGEN_BIN = $$system(which doxygen)
 
-DOXY_INPUT = .
-win32-g++ {
-        doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \
-                        set QDOC_PATH=$$[QT_INSTALL_DOCS] & \
-			doxygen $$PWD/$$DOXYFILE
-}
-else:win32 {
-        doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \
-                        set QDOC_PATH=$$[QT_INSTALL_DOCS] & \
-			doxygen $$PWD\\$$DOXYFILE
-}
-else {
-        doxy.commands = DOXY_SRC_ROOT="$$SourceRoot/src" \
-                        QDOC_PATH="$$[QT_INSTALL_DOCS]" \
-			doxygen $$PWD/$$DOXYFILE
-}
+isEmpty(DOXYGEN_BIN) {
+        message("Doxygen not found")
+} else {
+    DOXYFILE = Doxyfile.qmake
 
-doxy.CONFIG = no_link target_predeps
-doxy.depends = $$PWD/$$DOXYFILE
-doxy.input = DOXY_INPUT
-doxy.name = DOXY
-doxy.output = html/index.html
-QMAKE_EXTRA_COMPILERS += doxy
-OTHER_FILES += Doxyfile.qmake
+    DOXY_INPUT = .
+    win32-g++ {
+            doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \
+                            set QDOC_PATH=$$[QT_INSTALL_DOCS] & \
+                            doxygen $$PWD/$$DOXYFILE
+    }
+    else:win32 {
+            doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot\\src & \
+                            set QDOC_PATH=$$[QT_INSTALL_DOCS] & \
+                            doxygen $$PWD\\$$DOXYFILE
+    }
+    else {
+            doxy.commands = DOXY_SRC_ROOT="$$SourceRoot/src" \
+                            QDOC_PATH="$$[QT_INSTALL_DOCS]" \
+                            doxygen $$PWD/$$DOXYFILE
+    }
+
+    doxy.CONFIG = no_link target_predeps
+    doxy.depends = $$PWD/$$DOXYFILE
+    doxy.input = DOXY_INPUT
+    doxy.name = DOXY
+    doxy.output = html/index.html
+
+    QMAKE_EXTRA_COMPILERS += doxy
+    OTHER_FILES += Doxyfile.qmake
+}
 
 load(common_post)
diff --git a/mkspecs/features/config.pri b/mkspecs/features/config.pri
index 38a58d9a1..588e52277 100644
--- a/mkspecs/features/config.pri
+++ b/mkspecs/features/config.pri
@@ -15,4 +15,4 @@ BLACK_CONFIG    += ProfileRelease
 BLACK_CONFIG    += AssertsInRelease
 BLACK_CONFIG    += PackageInstaller
 #BLACK_CONFIG    += Static
-#BLACK_CONFIG    += Doxygen
+BLACK_CONFIG    += Doxygen