diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index a32c8dbd..446266ef 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -12,6 +12,7 @@ if(MACOSX)
  
     set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${ADDITIONAL_PATHS})
 endif()
+
 find_package(Doxygen REQUIRED)
 
 # set the input and output documentation paths
@@ -35,6 +36,11 @@ else()
     set(DOXYGEN_GENERATE_HTMLHELP NO)
 endif()
 
+find_path(MSCGEN_PATH mscgen.exe mscgen)
+if(NOT MSCGEN_PATH)
+    set(MSCGEN_PATH "")
+endif()
+
 # configure the source Doxyfile by copying it and replacing all @variables@
 set(DOXYGEN_CONFIGURED_INPUT ${DOXYGEN_OUTPUT_DIR}/doxyfile)
 configure_file(${DOXYGEN_INPUT_DIR}/doc/doxyfile.in ${DOXYGEN_CONFIGURED_INPUT} @ONLY)
diff --git a/doc/doxyfile.in b/doc/doxyfile.in
index 32dfaf5e..7d017baa 100644
--- a/doc/doxyfile.in
+++ b/doc/doxyfile.in
@@ -1354,7 +1354,7 @@ CLASS_DIAGRAMS         = YES
 # the mscgen tool resides. If left empty the tool is assumed to be found in the 
 # default search path.
 
-MSCGEN_PATH            = D:/Programmes/mscgen
+MSCGEN_PATH            = "@MSCGEN_PATH@"
 
 # If set to YES, the inheritance and collaboration graphs will hide 
 # inheritance and usage relations if the target is undocumented